ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10744 from LMESTM/Fix_sysTimerTest 

Fixes in Sys Timer test
pull/10907/head
Anna Bridge 2019-06-19 12:23:57 +01:00 committed by GitHub
parent ac274833f0 df07e7d29e
commit fe6f458222
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
TESTS/mbedmicro-rtos-mbed/systimer/main.cpp
View File

@ -31,6 +31,14 @@ extern "C" {
#define TEST_TICKS 42UL #define TEST_TICKS 42UL
#define DELAY_DELTA_US 2500ULL #define DELAY_DELTA_US 2500ULL
/* Use a specific delta value for deep sleep, as entry/exit adds up extra latency.
* Use deep sleep latency if defined and add 1ms extra delta */
#if defined MBED_CONF_TARGET_DEEP_SLEEP_LATENCY
#define DEEP_SLEEP_DELAY_DELTA_US ((MBED_CONF_TARGET_DEEP_SLEEP_LATENCY * 1000ULL) + 1000ULL)
#else
#define DEEP_SLEEP_DELAY_DELTA_US 2500ULL
#endif
using namespace utest::v1; using namespace utest::v1;
const us_timestamp_t DELAY_US = 1000000ULL * TEST_TICKS / OS_TICK_FREQ; const us_timestamp_t DELAY_US = 1000000ULL * TEST_TICKS / OS_TICK_FREQ;
@ -66,6 +74,11 @@ public:
{ {
return _sem.try_acquire_for(millisec); return _sem.try_acquire_for(millisec);
} }
void sem_acquire()
{
_sem.acquire();
}
}; };
timestamp_t mock_ticker_timestamp; timestamp_t mock_ticker_timestamp;
@ -275,9 +288,8 @@ void test_sleep(void)
st.schedule_tick(TEST_TICKS); st.schedule_tick(TEST_TICKS);
TEST_ASSERT_FALSE_MESSAGE(sleep_manager_can_deep_sleep(), "Deep sleep should be disallowed"); TEST_ASSERT_FALSE_MESSAGE(sleep_manager_can_deep_sleep(), "Deep sleep should be disallowed");
while (!st.sem_try_acquire(0)) { st.sem_acquire();
sleep();
}
timer.stop(); timer.stop();
sleep_manager_unlock_deep_sleep(); sleep_manager_unlock_deep_sleep();
@ -305,7 +317,6 @@ void test_deepsleep(void)
* so we'll use the wait_ms() function for now. * so we'll use the wait_ms() function for now.
*/ */
wait_ms(10); wait_ms(10);
// Regular Timer might be disabled during deepsleep. // Regular Timer might be disabled during deepsleep.
LowPowerTimer lptimer; LowPowerTimer lptimer;
SysTimerTest st; SysTimerTest st;
@ -313,12 +324,10 @@ void test_deepsleep(void)
lptimer.start(); lptimer.start();
st.schedule_tick(TEST_TICKS); st.schedule_tick(TEST_TICKS);
TEST_ASSERT_TRUE_MESSAGE(sleep_manager_can_deep_sleep_test_check(), "Deep sleep should be allowed"); TEST_ASSERT_TRUE_MESSAGE(sleep_manager_can_deep_sleep_test_check(), "Deep sleep should be allowed");
while (!st.sem_try_acquire(0)) { st.sem_acquire();
sleep();
}
lptimer.stop(); lptimer.stop();
TEST_ASSERT_UINT64_WITHIN(DELAY_DELTA_US, DELAY_US, lptimer.read_high_resolution_us()); TEST_ASSERT_UINT64_WITHIN(DEEP_SLEEP_DELAY_DELTA_US, DELAY_US, lptimer.read_high_resolution_us());
} }
#endif #endif
#endif #endif