ARMmbed · c1728p9 · Sep 19, 2017 · Oct 2, 2017 · Oct 30, 2017 · Dec 19, 2017
diff --git a/TESTS/events/queue/main.cpp b/TESTS/events/queue/main.cpp
@@ -20,6 +20,10 @@
 #include "unity.h"
 #include "utest.h"
 
+#if !DEVICE_USTICKER
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 using namespace utest::v1;
 
 // TEST_EQUEUE_SIZE was reduced below 1024B to fit this test to devices with small RAM (RAM <= 16kB)

diff --git a/TESTS/events/timing/main.cpp b/TESTS/events/timing/main.cpp
@@ -24,6 +24,9 @@
 
 using namespace utest::v1;
 
+#if !DEVICE_USTICKER
+  #error [NOT_SUPPORTED] test not supported
+#endif
 
 // Test delay
 #ifndef TEST_EVENTS_TIMING_TIME

diff --git a/TESTS/mbed_drivers/lp_ticker/main.cpp b/TESTS/mbed_drivers/lp_ticker/main.cpp
@@ -19,7 +19,7 @@
 #include "unity/unity.h"
 
 
-#if !DEVICE_LOWPOWERTIMER
+#if !DEVICE_LPTICKER
     #error [NOT_SUPPORTED] Low power ticker not supported for this target
 #endif
 

diff --git a/TESTS/mbed_drivers/lp_timeout/main.cpp b/TESTS/mbed_drivers/lp_timeout/main.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#if !DEVICE_LOWPOWERTIMER
-#error [NOT_SUPPORTED] Low power timer not supported for this target
+#if !DEVICE_LPTICKER
+    #error [NOT_SUPPORTED] Low power timer not supported for this target
 #endif
 
 #include "mbed.h"

diff --git a/TESTS/mbed_drivers/lp_timer/main.cpp b/TESTS/mbed_drivers/lp_timer/main.cpp
@@ -22,7 +22,7 @@
 #include "rtos.h"
 #include "hal/us_ticker_api.h"
 
-#if !DEVICE_LOWPOWERTIMER
+#if !DEVICE_LPTICKER
 #error [NOT_SUPPORTED] test not supported
 #endif
 

diff --git a/TESTS/mbed_drivers/race_test/main.cpp b/TESTS/mbed_drivers/race_test/main.cpp
@@ -26,6 +26,10 @@
   #error [NOT_SUPPORTED] test not supported for single threaded enviroment
 #endif
 
+#if !DEVICE_USTICKER
+#error [NOT_SUPPORTED] test not supported
+#endif
+
 using namespace utest::v1;
 
 #define TEST_STACK_SIZE     512

diff --git a/TESTS/mbed_drivers/rtc/main.cpp b/TESTS/mbed_drivers/rtc/main.cpp
@@ -21,7 +21,7 @@
 #include "rtos.h"
 #include "rtc_api.h"
 
-#if !DEVICE_RTC
+#if !DEVICE_RTC || !DEVICE_USTICKER
 #error [NOT_SUPPORTED] test not supported
 #endif
 

diff --git a/TESTS/mbed_drivers/ticker/main.cpp b/TESTS/mbed_drivers/ticker/main.cpp
@@ -18,6 +18,9 @@
 #include "utest/utest.h"
 #include "unity/unity.h"
 
+#if !DEVICE_USTICKER
+#error [NOT_SUPPORTED] test not supported
+#endif
 
 using utest::v1::Case;
 

diff --git a/TESTS/mbed_drivers/timeout/timeout_tests.h b/TESTS/mbed_drivers/timeout/timeout_tests.h
@@ -276,7 +276,7 @@ void test_sleep(void)
     timeout.detach();
 }
 
-#if DEVICE_LOWPOWERTIMER
+#if DEVICE_LPTICKER
 /** Template for tests: timeout during deepsleep
  *
  * Test timeout during deepsleep

diff --git a/TESTS/mbed_drivers/timer/main.cpp b/TESTS/mbed_drivers/timer/main.cpp
@@ -22,6 +22,10 @@
 #include "rtos.h"
 #include "hal/us_ticker_api.h"
 
+#if !DEVICE_USTICKER
+  #error [NOT_SUPPORTED] test not supported
+#endif
+
 using namespace utest::v1;
 
 extern uint32_t SystemCoreClock;