ARMmbed · 0xc0170 · Nov 12, 2019 · Oct 21, 2019 · Oct 22, 2019 · Oct 29, 2019
diff --git a/TESTS/configs/baremetal.json b/TESTS/configs/baremetal.json
@@ -0,0 +1,42 @@
+{ 
+    "requires": [ 
+        "bare-metal", 
+        "rtos-api",
+        "greentea-client", 
+        "utest", 
+        "unity",
+        "psa",
+        "mbed-crypto",        
+        "mbedtls",
+        "psa-compliance-framework",
+        "filesystem",
+        "littlefs",
+        "mbed-trace",
+        "device_key",
+        "storage_tdb_internal",
+        "storage_filesystem",
+        "storage_tdb_external",
+        "lora",
+        "nfc",
+        "network-emac",
+        "nanostack-libservice",
+        "flashiap-block-device",
+        "system-storage",
+        "filesystemstore",
+        "SecureStore",
+        "storage",
+        "kv-map",
+        "direct-access-devicekey",
+        "tdbstore",
+        "kv-config",
+        "events",
+        "kv-global-api",
+        "sd",
+        "nvstore"
+    ],
+    "target_overrides": {
+        "*": {
+            "target.device_has_remove": ["EMAC", "USBDEVICE"]
+        }
+     }
+}
diff --git a/TESTS/events/queue/main.cpp b/TESTS/events/queue/main.cpp
@@ -15,7 +15,6 @@
  */
 #include "mbed_events.h"
 #include "mbed.h"
-#include "rtos.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"

diff --git a/TESTS/events/timing/main.cpp b/TESTS/events/timing/main.cpp
@@ -15,7 +15,6 @@
  */
 #include "mbed_events.h"
 #include "mbed.h"
-#include "rtos.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"

diff --git a/TESTS/integration/COMMON/download_test.cpp b/TESTS/integration/COMMON/download_test.cpp
@@ -21,6 +21,8 @@
  * Based on mbed-stress-test by Marcus Chang @ Arm Mbed - http://github.com/ARMmbed/mbed-stress-test
 */
 
+#if INTEGRATION_TESTS
+
 #include "mbed.h"
 #include "unity/unity.h"
 #include "greentea-client/test_env.h"
@@ -202,4 +204,4 @@ size_t download_test(NetworkInterface *interface, const unsigned char *data, siz
 
     return received_bytes;
 }
-
+#endif // INTEGRATION_TESTS
diff --git a/TESTS/integration/COMMON/download_test.h b/TESTS/integration/COMMON/download_test.h
@@ -20,6 +20,5 @@
 /*
  * Based on mbed-stress-test by Marcus Chang @ Arm Mbed - http://github.com/ARMmbed/mbed-stress-test
 */
-
 size_t download_test(NetworkInterface *interface, const unsigned char *data, size_t data_length, size_t buff_size, uint32_t thread_id = 0);
 
diff --git a/TESTS/integration/COMMON/file_test.cpp b/TESTS/integration/COMMON/file_test.cpp
@@ -20,6 +20,7 @@
 /*
  * Based on mbed-stress-test by Marcus Chang @ Arm Mbed - http://github.com/ARMmbed/mbed-stress-test
 */
+#if INTEGRATION_TESTS
 
 #include "mbed.h"
 #include "unity/unity.h"
@@ -103,3 +104,4 @@ void file_test_read(const char *file, size_t offset, const unsigned char *data,
            float(data_length) / 1024, float(data_length) / timer.read() / 1024, timer.read());
 }
 
+#endif //#if INTEGRATION_TESTS
diff --git a/TESTS/integration/COMMON/file_test.h b/TESTS/integration/COMMON/file_test.h
@@ -20,7 +20,6 @@
 /*
  * Based on mbed-stress-test by Marcus Chang @ Arm Mbed - http://github.com/ARMmbed/mbed-stress-test
 */
-
 void file_test_write(const char *file, size_t offset, const unsigned char *data, size_t data_length, size_t block_size);
 
 void file_test_read(const char *file, size_t offset, const unsigned char *data, size_t data_length, size_t block_size);
diff --git a/TESTS/integration/fs-single/main.cpp b/TESTS/integration/fs-single/main.cpp
@@ -21,6 +21,10 @@
  * Based on mbed-stress-test by Marcus Chang @ Arm Mbed - http://github.com/ARMmbed/mbed-stress-test
 */
 
+#if !INTEGRATION_TESTS
+#error [NOT_SUPPORTED] integration tests not enabled for this target
+#else
+
 #include "mbed.h"
 #include "FATFileSystem.h"
 #include "LittleFileSystem.h"
@@ -30,10 +34,6 @@
 #include "common_defines_test.h"
 #include "file_test.h"
 
-#if !INTEGRATION_TESTS
-#error [NOT_SUPPORTED] integration tests not enabled for this target
-#endif
-
 #ifdef MBED_CONF_APP_BASICS_TEST_FILENAME
 #include MBED_CONF_APP_BASICS_TEST_FILENAME
 #else
@@ -162,3 +162,4 @@ int main()
 
     return !Harness::run(specification);
 }
+#endif // !INTEGRATION_TESTS
diff --git a/TESTS/integration/fs-threaded/main.cpp b/TESTS/integration/fs-threaded/main.cpp
@@ -21,6 +21,10 @@
  * Based on mbed-stress-test by Marcus Chang @ Arm Mbed - http://github.com/ARMmbed/mbed-stress-test
 */
 
+#if !INTEGRATION_TESTS
+#error [NOT_SUPPORTED] integration tests not enabled for this target
+#else
+
 #include "mbed.h"
 #include "FATFileSystem.h"
 #include "LittleFileSystem.h"
@@ -30,10 +34,6 @@
 #include "common_defines_test.h"
 #include "file_test.h"
 
-#if !INTEGRATION_TESTS
-#error [NOT_SUPPORTED] integration tests not enabled for this target
-#endif
-
 #ifdef MBED_CONF_APP_BASICS_TEST_FILENAME
 #include MBED_CONF_APP_BASICS_TEST_FILENAME
 #else
@@ -181,3 +181,4 @@ int main()
 
     return !Harness::run(specification);
 }
+#endif // !INTEGRATION_TESTS
diff --git a/TESTS/integration/net-single/main.cpp b/TESTS/integration/net-single/main.cpp
@@ -21,6 +21,10 @@
  * Based on mbed-stress-test by Marcus Chang @ Arm Mbed - http://github.com/ARMmbed/mbed-stress-test
 */
 
+#if !INTEGRATION_TESTS
+#error [NOT_SUPPORTED] integration tests not enabled for this target
+#else
+
 #include "mbed.h"
 #include "utest/utest.h"
 #include "unity/unity.h"
@@ -29,10 +33,6 @@
 #include "download_test.h"
 #include <string>
 
-#if !INTEGRATION_TESTS
-#error [NOT_SUPPORTED] integration tests not enabled for this target
-#endif
-
 #ifdef MBED_CONF_APP_BASICS_TEST_FILENAME
 #include MBED_CONF_APP_BASICS_TEST_FILENAME
 #else
@@ -139,3 +139,4 @@ int main()
 
     return !Harness::run(specification);
 }
+#endif // !INTEGRATION_TESTS
diff --git a/TESTS/integration/net-threaded/main.cpp b/TESTS/integration/net-threaded/main.cpp
@@ -21,6 +21,10 @@
  * Based on mbed-stress-test by Marcus Chang @ Arm Mbed - http://github.com/ARMmbed/mbed-stress-test
 */
 
+#if !INTEGRATION_TESTS
+#error [NOT_SUPPORTED] integration tests not enabled for this target
+#else
+
 #include "mbed.h"
 #include "utest/utest.h"
 #include "unity/unity.h"
@@ -29,10 +33,6 @@
 #include "download_test.h"
 #include <string>
 
-#if !INTEGRATION_TESTS
-#error [NOT_SUPPORTED] integration tests not enabled for this target
-#endif
-
 #ifdef MBED_CONF_APP_BASICS_TEST_FILENAME
 #include MBED_CONF_APP_BASICS_TEST_FILENAME
 #else
@@ -173,3 +173,4 @@ int main()
 
     return !Harness::run(specification);
 }
+#endif // !INTEGRATION_TESTS
diff --git a/TESTS/integration/stress-net-fs/main.cpp b/TESTS/integration/stress-net-fs/main.cpp
@@ -21,6 +21,10 @@
  * Based on mbed-stress-test by Marcus Chang @ Arm Mbed - http://github.com/ARMmbed/mbed-stress-test
 */
 
+#if !INTEGRATION_TESTS
+#error [NOT_SUPPORTED] integration tests not enabled for this target
+#else
+
 #include "mbed.h"
 #include "FATFileSystem.h"
 #include "LittleFileSystem.h"
@@ -32,9 +36,6 @@
 #include "file_test.h"
 #include <string>
 
-#if !INTEGRATION_TESTS
-#error [NOT_SUPPORTED] integration tests not enabled for this target
-#endif
 
 #ifdef MBED_CONF_APP_BASICS_TEST_FILENAME
 #include MBED_CONF_APP_BASICS_TEST_FILENAME
@@ -243,3 +244,4 @@ int main()
 
     return !Harness::run(specification);
 }
+#endif // !INTEGRATION_TESTS
diff --git a/TESTS/mbed_drivers/crc/main.cpp b/TESTS/mbed_drivers/crc/main.cpp
@@ -134,6 +134,7 @@ void test_thread(void)
     TEST_ASSERT_EQUAL(0xCBF43926, crc);
 }
 
+#if defined(MBED_CONF_RTOS_PRESENT)
 void test_thread_safety()
 {
     char  test[] = "123456789";
@@ -153,13 +154,16 @@ void test_thread_safety()
     // Wait for the thread to finish
     t1.join();
 }
+#endif
 
 Case cases[] = {
     Case("Test supported polynomials", test_supported_polynomials),
     Case("Test partial CRC", test_partial_crc),
     Case("Test SD CRC polynomials", test_sd_crc),
-    Case("Test not supported polynomials", test_any_polynomial),
-    Case("Test thread safety", test_thread_safety)
+#if defined(MBED_CONF_RTOS_PRESENT)
+    Case("Test thread safety", test_thread_safety),
+#endif
+    Case("Test not supported polynomials", test_any_polynomial)
 };
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases)

diff --git a/TESTS/mbed_drivers/lp_timeout/main.cpp b/TESTS/mbed_drivers/lp_timeout/main.cpp
@@ -13,6 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] Low power timer test cases require a RTOS to run.
+#else
 
 #if !DEVICE_LPTICKER
 #error [NOT_SUPPORTED] Low power timer not supported for this target
@@ -95,3 +98,4 @@ int main()
 }
 
 #endif // !DEVICE_LPTICKER
+#endif //!defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/mbed_drivers/lp_timer/main.cpp b/TESTS/mbed_drivers/lp_timer/main.cpp
@@ -19,7 +19,6 @@
 #include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"
-#include "rtos.h"
 #include "hal/us_ticker_api.h"
 
 #if !DEVICE_LPTICKER

diff --git a/TESTS/mbed_drivers/race_test/main.cpp b/TESTS/mbed_drivers/race_test/main.cpp
@@ -14,6 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#if defined(MBED_RTOS_SINGLE_THREAD) || !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] Race test test cases require RTOS with multithread to run
+#else
+
+#if !DEVICE_USTICKER
+#error [NOT_SUPPORTED] UsTicker need to be enabled for this test.
+#else
+
 #include "mbed.h"
 #include "rtos.h"
 #include "greentea-client/test_env.h"
@@ -22,10 +30,6 @@
 #include "SingletonPtr.h"
 #include <stdio.h>
 
-#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;
 
 #define TEST_STACK_SIZE     512
@@ -132,4 +136,5 @@ int main()
     Harness::run(specification);
 }
 
-#endif // defined(MBED_RTOS_SINGLE_THREAD) || !DEVICE_USTICKER
+#endif // !DEVICE_USTICKER
+#endif // defined(MBED_RTOS_SINGLE_THREAD) || !defined(MBED_CONF_RTOS_THREAD)
diff --git a/TESTS/mbed_drivers/rtc/main.cpp b/TESTS/mbed_drivers/rtc/main.cpp
@@ -18,7 +18,6 @@
 #include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"
-#include "rtos.h"
 #include "rtc_api.h"
 
 #if !DEVICE_RTC || !DEVICE_USTICKER

diff --git a/TESTS/mbed_drivers/timer/main.cpp b/TESTS/mbed_drivers/timer/main.cpp
@@ -19,7 +19,6 @@
 #include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"
-#include "rtos.h"
 #include "hal/us_ticker_api.h"
 
 #if !DEVICE_USTICKER

diff --git a/TESTS/mbed_drivers/watchdog/main.cpp b/TESTS/mbed_drivers/watchdog/main.cpp
@@ -14,6 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] Watchdog test cases require a RTOS to run.
+#else
+
 #if !DEVICE_WATCHDOG
 #error [NOT_SUPPORTED] Watchdog not supported for this target
 #else
@@ -284,3 +289,4 @@ int main()
 }
 
 #endif // !DEVICE_WATCHDOG
+#endif // !defined(MBED_CONG_RTOS_PRESENT)
diff --git a/TESTS/mbed_drivers/watchdog_reset/main.cpp b/TESTS/mbed_drivers/watchdog_reset/main.cpp
@@ -14,6 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] Watchdog reset test cases require a RTOS to run.
+#else
+
 #if !DEVICE_WATCHDOG
 #error [NOT_SUPPORTED] Watchdog not supported for this target
 #else
@@ -334,3 +338,4 @@ int main()
     return !Harness::run(specification);
 }
 #endif // !DEVICE_WATCHDOG
+#endif // !defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/mbed_hal/common_tickers/main.cpp b/TESTS/mbed_hal/common_tickers/main.cpp
@@ -13,6 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#if !defined(MBED_RTOS_CONF_PRESENT)
+#error [NOT_SUPPORTED] usticker test cases require a RTOS to run
+#else
+
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -606,3 +611,4 @@ int main()
     return !Harness::run(specification);
 }
 #endif // !DEVICE_USTICKER
+#endif // !defined(MBED_RTOS_CONF_PRESENT)
diff --git a/TESTS/mbed_hal/common_tickers_freq/main.cpp b/TESTS/mbed_hal/common_tickers_freq/main.cpp
@@ -20,6 +20,9 @@
  * freqency is valid.
  */
 
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] common tickers frequency test cases require a RTOS to run.
+#else
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -206,3 +209,4 @@ int main()
 }
 
 #endif // defined(SKIP_TIME_DRIFT_TESTS) || !DEVICE_USTICKER
+#endif // !defined(MBED_RTOS_CONF_PRESENT)
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,5 @@ @@
     /*
      * Based on mbed-stress-test by Marcus Chang @ Arm Mbed - http://github.com/ARMmbed/mbed-stress-test
     */
     size_t download_test(NetworkInterface *interface, const unsigned char *data, size_t data_length, size_t buff_size, uint32_t thread_id = 0);