Merge pull request #11195 from ARMmbed/release-candidate

Release candidate for mbed-os-5.13.3

Author: 0xc0170

TESTS/events/queue/main.cpp

@@ -22,7 +22,7 @@
 
 #if !DEVICE_USTICKER
 #error [NOT_SUPPORTED] test not supported
-#endif
+#else
 
 using namespace utest::v1;
 
@@ -357,3 +357,4 @@ int main()
     return !Harness::run(specification);
 }
 
+#endif // !DEVICE_USTICKER

TESTS/events/timing/main.cpp

@@ -26,7 +26,7 @@ using namespace utest::v1;
 
 #if !DEVICE_USTICKER
 #error [NOT_SUPPORTED] test not supported
-#endif
+#else
 
 // Test delay
 #ifndef TEST_EVENTS_TIMING_TIME
@@ -148,3 +148,4 @@ int main()
     return !Harness::run(specification);
 }
 
+#endif // !DEVICE_USTICKER

TESTS/lorawan/loraradio/main.cpp

@@ -36,6 +36,7 @@
 #error [NOT_SUPPORTED] Requires parameters from application config file.
 #endif
 
+#if (MBED_CONF_APP_LORA_RADIO == SX1272) || (MBED_CONF_APP_LORA_RADIO == SX1276)
 
 using namespace utest::v1;
 using namespace mbed;
@@ -281,3 +282,5 @@ int main()
 {
     return !Harness::run(specification);
 }
+
+#endif // (MBED_CONF_APP_LORA_RADIO == SX1272) || (MBED_CONF_APP_LORA_RADIO == SX1276)

TESTS/mbed-crypto/sanity/main.cpp

@@ -19,7 +19,7 @@
 
 #if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
 #error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
-#endif
+#else
 
 #include <stdio.h>
 #include "mbed.h"
@@ -460,3 +460,4 @@ int main(void)
 {
     return !Harness::run(specification);
 }
+#endif // ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))

TESTS/mbed_drivers/flashiap/main.cpp

@@ -17,7 +17,7 @@
 
 #if !DEVICE_FLASH
 #error [NOT_SUPPORTED] Flash API not supported for this target
-#endif
+#else
 
 #include "utest/utest.h"
 #include "utest/utest_serial.h"
@@ -328,3 +328,5 @@ int main()
 {
     Harness::run(specification);
 }
+
+#endif // !DEVICE_FLASH

TESTS/mbed_drivers/lp_ticker/main.cpp

@@ -21,7 +21,7 @@
 
 #if !DEVICE_LPTICKER
 #error [NOT_SUPPORTED] Low power ticker not supported for this target
-#endif
+#else
 
 using utest::v1::Case;
 
@@ -228,3 +228,5 @@ int main()
 {
     utest::v1::Harness::run(specification);
 }
+
+#endif // !DEVICE_LPTICKER

TESTS/mbed_drivers/lp_timeout/main.cpp

@@ -16,7 +16,7 @@
 
 #if !DEVICE_LPTICKER
 #error [NOT_SUPPORTED] Low power timer not supported for this target
-#endif
+#else
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -93,3 +93,5 @@ int main()
 {
     Harness::run(specification);
 }
+
+#endif // !DEVICE_LPTICKER

TESTS/mbed_drivers/lp_timer/main.cpp

@@ -24,7 +24,7 @@
 
 #if !DEVICE_LPTICKER
 #error [NOT_SUPPORTED] test not supported
-#endif
+#else
 
 using namespace utest::v1;
 
@@ -350,3 +350,5 @@ int main()
 {
     return !Harness::run(specification);
 }
+
+#endif // !DEVICE_LPTICKER

TESTS/mbed_drivers/mem_trace/main.cpp

@@ -26,7 +26,7 @@
 
 #ifndef MBED_MEM_TRACING_ENABLED
 #error [NOT_SUPPORTED] test not supported
-#endif
+#else
 
 using utest::v1::Case;
 
@@ -427,3 +427,5 @@ int main()
 
     return !utest::v1::Harness::run(specification);
 }
+
+#endif // MBED_MEM_TRACING_ENABLED

TESTS/mbed_drivers/race_test/main.cpp

@@ -22,13 +22,9 @@
 #include "SingletonPtr.h"
 #include <stdio.h>
 
-#ifdef MBED_RTOS_SINGLE_THREAD
-#error [NOT_SUPPORTED] test not supported for single threaded enviroment
-#endif
-
-#if !DEVICE_USTICKER
-#error [NOT_SUPPORTED] test not supported
-#endif
+#if defined(MBED_RTOS_SINGLE_THREAD) || !DEVICE_USTICKER
+#error [NOT_SUPPORTED] Test not supported for single threaded enviroment. UsTicker need to be enabled for this test.
+#else
 
 using namespace utest::v1;
 
@@ -135,3 +131,5 @@ int main()
 {
     Harness::run(specification);
 }
+
+#endif // defined(MBED_RTOS_SINGLE_THREAD) || !DEVICE_USTICKER