Merge branch 'master' into bring_fpga_tests_master_spec

Author: mprse

.travis.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2018 Arm Limited. All rights reserved.
+# Copyright (c) 2013-2019 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -222,14 +222,14 @@ matrix:
         # Check that example compiles without rtos
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp
         - |
-          rm -r rtos usb features/cellular features/netsocket features/nanostack \
+          rm -r rtos drivers/source/usb features/cellular features/netsocket features/nanostack \
             features/lwipstack features/frameworks/greentea-client \
             features/frameworks/utest features/frameworks/unity components BUILD
         - python tools/make.py -t GCC_ARM -m DISCO_F401VC --source=. --build=BUILD/DISCO_F401VC/GCC_ARM -j0
         # Run local equeue tests
-        - make -C ${EVENTS}/equeue test
+        - make -C ${EVENTS}/source test
         # Run profiling tests
-        - make -C ${EVENTS}/equeue prof | tee prof
+        - make -C ${EVENTS}/source prof | tee prof
       after_success:
         # Update status, comparing with master if possible.
         - |

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/c_strings/main.cpp

@@ -28,7 +28,7 @@ static char buffer[256] = {0};
 #define CLEAN_BUFFER memset(::buffer, 0x00, sizeof(::buffer))
 #define NEGATIVE_INTEGERS -32768,-3214,-999,-100,-1,0,-1,-4231,-999,-4123,-32760,-99999
 #define POSITIVE_INTEGERS 32768,3214,999,100,1,0,1,4231,999,4123,32760,99999
-#define FLOATS  0.002,0.92430,15.91320,791.77368,6208.2,25719.4952,426815.982588,6429271.046,42468024.93,212006462.910
+#define FLOATS  0.002,0.92430,15.91320,791.77368,6208.2,25719.4952,426815.982588,6429271.046,42468024.93,212006462.910,6579.048
 
 using namespace utest::v1;
 
@@ -47,7 +47,7 @@ void test_case_c_string_u_d()
     TEST_ASSERT_EQUAL_STRING("32768 3214 999 100 1 0 1 4231 999 4123 32760 99999", buffer);
 }
 
-void test_case_c_string_x_E()
+void test_case_c_string_x_X()
 {
     CLEAN_BUFFER;
     sprintf(buffer, "%x %X %x %X %x %X %x %X %x %X %x %X", POSITIVE_INTEGERS);
@@ -57,22 +57,22 @@ void test_case_c_string_x_E()
 void test_case_c_string_f_f()
 {
     CLEAN_BUFFER;
-    sprintf(buffer, "%f %f %f %f %f %f %f %f %f %f", FLOATS);
-    TEST_ASSERT_EQUAL_STRING("0.002000 0.924300 15.913200 791.773680 6208.200000 25719.495200 426815.982588 6429271.046000 42468024.930000 212006462.910000", buffer);
+    sprintf(buffer, "%f %f %f %f %f %f %f %f %f %f %f", FLOATS);
+    TEST_ASSERT_EQUAL_STRING("0.002000 0.924300 15.913200 791.773680 6208.200000 25719.495200 426815.982588 6429271.046000 42468024.930000 212006462.910000 6579.048000", buffer);
 }
 
 void test_case_c_string_g_g()
 {
     CLEAN_BUFFER;
-    sprintf(buffer, "%g %g %g %g %g %g %g %g %g %g", FLOATS);
-    TEST_ASSERT_EQUAL_STRING("0.002 0.9243 15.9132 791.774 6208.2 25719.5 426816 6.42927e+06 4.2468e+07 2.12006e+08", buffer);
+    sprintf(buffer, "%g %g %g %g %g %g %g %g %g %g %g", FLOATS);
+    TEST_ASSERT_EQUAL_STRING("0.002 0.9243 15.9132 791.774 6208.2 25719.5 426816 6.42927e+06 4.2468e+07 2.12006e+08 6579.05", buffer);
 }
 
 void test_case_c_string_e_E()
 {
     CLEAN_BUFFER;
-    sprintf(buffer, "%e %E %e %E %e %E %e %E %e %E", FLOATS);
-    TEST_ASSERT_EQUAL_STRING("2.000000e-03 9.243000E-01 1.591320e+01 7.917737E+02 6.208200e+03 2.571950E+04 4.268160e+05 6.429271E+06 4.246802e+07 2.120065E+08", buffer);
+    sprintf(buffer, "%e %E %e %E %e %E %e %E %e %E %e", FLOATS);
+    TEST_ASSERT_EQUAL_STRING("2.000000e-03 9.243000E-01 1.591320e+01 7.917737E+02 6.208200e+03 2.571950E+04 4.268160e+05 6.429271E+06 4.246802e+07 2.120065E+08 6.579048e+03", buffer);
 }
 
 void test_case_c_string_strtok()
@@ -112,10 +112,12 @@ Case cases[] = {
     Case("C strings: strpbrk", test_case_c_string_strpbrk, greentea_failure_handler),
     Case("C strings: %i %d integer formatting", test_case_c_string_i_d, greentea_failure_handler),
     Case("C strings: %u %d integer formatting", test_case_c_string_u_d, greentea_failure_handler),
-    Case("C strings: %x %E integer formatting", test_case_c_string_x_E, greentea_failure_handler),
+    Case("C strings: %x %E integer formatting", test_case_c_string_x_X, greentea_failure_handler),
     Case("C strings: %f %f float formatting", test_case_c_string_f_f, greentea_failure_handler),
+#ifndef MBED_MINIMAL_PRINTF
     Case("C strings: %e %E float formatting", test_case_c_string_e_E, greentea_failure_handler),
     Case("C strings: %g %g float formatting", test_case_c_string_g_g, greentea_failure_handler),
+#endif
 };
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases)

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