-New PR for PSA,Netsocket,storage components,reverted all the changes to back to original

-Change the #error description more precisely
 -Separated the MBED_CONF_RTOS_PRESENT guarded

TESTS/lorawan/loraradio/main.cpp

@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] LORADIO tests are not enabled for Bare Metal.
-#else
 
 #include "utest.h"
 #include "unity.h"
@@ -287,4 +284,3 @@ int main()
 }
 
 #endif // (MBED_CONF_APP_LORA_RADIO == SX1272) || (MBED_CONF_APP_LORA_RADIO == SX1276)
-#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/mbed_drivers/lp_timeout/main.cpp

@@ -13,9 +13,12 @@
  * 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 requires RTOS to run.
+#else
 
-#if !DEVICE_LPTICKER || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] Low power timer test cases are not supported.
+#if !DEVICE_LPTICKER
+#error [NOT_SUPPORTED] Low power timer not supported for this target
 #else
 
 #include "mbed.h"
@@ -95,3 +98,4 @@ int main()
 }
 
 #endif // !DEVICE_LPTICKER
+#endif //!defined(MBED_CONF_RTOS_PRESENT)

TESTS/mbed_drivers/timeout/main.cpp

@@ -13,14 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] usticker test requires RTOS to run.
+#else
+
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "utest/utest.h"
 #include "unity/unity.h"
 #include "timeout_tests.h"
 
-#if !DEVICE_USTICKER || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] usticker test not supported.
+#if !DEVICE_USTICKER
+#error [NOT_SUPPORTED] usticker not supported for this target.
 #else
 
 using namespace utest::v1;
@@ -89,3 +94,4 @@ int main()
 }
 
 #endif // !DEVICE_USTICKER
+#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/mbed_drivers/timerevent/main.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #if !DEVICE_USTICKER || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] usticker test not supported.
+#error [NOT_SUPPORTED] usticker test case requires RTOS to run and also usticker needs to be enabled for this target.
 #else
 
 #include "mbed.h"

TESTS/mbed_drivers/watchdog/main.cpp

@@ -14,8 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if !DEVICE_WATCHDOG || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] Watchdo test not supported.
+
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] Watchdog test cases requires RTOS to run.
+#else
+
+#if !DEVICE_WATCHDOG
+#error [NOT_SUPPORTED] Watchdog not supported for this target
 #else
 
 #include "greentea-client/test_env.h"
@@ -284,3 +289,4 @@ int main()
 }
 
 #endif // !DEVICE_WATCHDOG
+#endif // !defined(MBED_CONG_RTOS_PRESENT)

TESTS/mbed_drivers/watchdog_reset/main.cpp

@@ -14,8 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if !DEVICE_WATCHDOG || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] Watchdog reset test not supported.
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] Watchdog reset test cases requires RTOS to run.
+#else
+
+#if !DEVICE_WATCHDOG
+#error [NOT_SUPPORTED] Watchdog not supported for this target
 #else
 
 #include "greentea-client/test_env.h"
@@ -334,3 +338,4 @@ int main()
     return !Harness::run(specification);
 }
 #endif // !DEVICE_WATCHDOG
+#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/mbed_hal/common_tickers/main.cpp

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#if !DEVICE_USTICKER || !defined(MBED_RTOS_CONF_PRESENT)
-#error [NOT_SUPPORTED] test not supported
+#if !defined(MBED_RTOS_CONF_PRESENT)
+#error [NOT_SUPPORTED] usticker test cases requires RTOS to run
 #else
 
 #include "mbed.h"
@@ -35,6 +35,9 @@ extern "C" {
 }
 #endif // __cplusplus
 
+#if !DEVICE_USTICKER
+#error [NOT_SUPPORTED] test not supported
+#else
 
 #define US_PER_S 1000000
 
@@ -607,4 +610,5 @@ int main()
 {
     return !Harness::run(specification);
 }
-#endif // !DEVICE_USTICKER || !defined(MBED_RTOS_CONF_PRESENT)
+#endif // !DEVICE_USTICKER
+#endif // !defined(MBED_RTOS_CONF_PRESENT)

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 requires RTOS to run.
+#else
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -30,7 +33,7 @@
 #include "hal/lp_ticker_api.h"
 #include "hal/mbed_lp_ticker_wrapper.h"
 
-#if defined(SKIP_TIME_DRIFT_TESTS) || !DEVICE_USTICKER || !defined(MBED_CONF_RTOS_PRESENT)
+#if defined(SKIP_TIME_DRIFT_TESTS) || !DEVICE_USTICKER
 #error [NOT_SUPPORTED] test not supported
 #else
 
@@ -205,4 +208,5 @@ int main()
     Harness::run(specification);
 }
 
-#endif // defined(SKIP_TIME_DRIFT_TESTS) || !DEVICE_USTICKER || !defined(MBED_RTOS_CONF_PRESENT)
+#endif // defined(SKIP_TIME_DRIFT_TESTS) || !DEVICE_USTICKER
+#endif // !defined(MBED_RTOS_CONF_PRESENT)

TESTS/mbed_hal/lp_ticker/main.cpp

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#if !DEVICE_LPTICKER || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] Low power timer test not supported.
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] Low power timer test cases requires RTOS to run.
 #else
 
 #include "mbed.h"
@@ -28,7 +28,9 @@
 #include "hal/mbed_lp_ticker_wrapper.h"
 #include "hal/us_ticker_api.h"
 
-
+#if !DEVICE_LPTICKER
+#error [NOT_SUPPORTED] Low power timer not supported for this target
+#else
 
 using namespace utest::v1;
 
@@ -209,4 +211,5 @@ int main()
     return !Harness::run(specification);
 }
 
-#endif // !DEVICE_LPTICKER || !defined(MBED_CONF_RTOS_PRESENT)
+#endif // !DEVICE_LPTICKER
+#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/mbed_hal/sleep/main.cpp

@@ -14,8 +14,12 @@
  * limitations under the License.
  */
 
-#if !DEVICE_SLEEP || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] sleep not supported for this target and also for bare metal.
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] sleep test cases requires RTOS to run.
+#else
+
+#if !DEVICE_SLEEP
+#error [NOT_SUPPORTED] sleep not supported for this target
 #else
 
 #include "mbed.h"
@@ -262,4 +266,5 @@ int main()
     Harness::run(specification);
 }
 
-#endif // !DEVICE_SLEEP || !defined(MBED_CONF_RTOS_PRESENT)
+#endif // !DEVICE_SLEEP
+#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/mbed_hal/sleep_manager/main.cpp

@@ -13,6 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] sleep manager test cases requires RTOS to run.
+#else
+
 #include "utest/utest.h"
 #include "unity/unity.h"
 #include "greentea-client/test_env.h"
@@ -23,7 +27,7 @@
 #include "../sleep/sleep_test_utils.h"
 #include "sleep_manager_api_tests.h"
 
-#if !DEVICE_SLEEP || !defined(MBED_CONF_RTOS_PRESENT)
+#if !DEVICE_SLEEP
 #error [NOT_SUPPORTED] test not supported
 #else
 
@@ -335,4 +339,5 @@ int main()
     return !Harness::run(specification);
 }
 
-#endif // !DEVICE_SLEEP || !defined(MBED_CONF_RTOS_PRESENT)
+#endif // !DEVICE_SLEEP
+#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/mbed_hal/stack_size_unification/main.cpp

@@ -15,13 +15,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] stack size unification test cases requires RTOS to run.
+#else
+
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"
 
-#if defined(TARGET_RENESAS) || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] Cortex-A target and bare metal not supported for this test
+#ifdef TARGET_RENESAS
+#error [NOT_SUPPORTED] Cortex-A target not supported for this test
 #else
 
 using namespace utest::v1;
@@ -75,4 +79,5 @@ int main()
     return !Harness::run(specification);
 }
 
-#endif // TARGET_RENESAS || !defined(MBED_CONF_RTOS_PRESENT)
+#endif // TARGET_RENESAS
+#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/mbed_hal/watchdog/main.cpp

@@ -14,8 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if !DEVICE_WATCHDOG || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] Watchdog test not supported.
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] Watchdog test cases requires RTOS to run.
+#else
+
+#if !DEVICE_WATCHDOG
+#error [NOT_SUPPORTED] Watchdog not supported for this target
 #else
 
 #include "greentea-client/test_env.h"
@@ -284,4 +288,5 @@ int main()
     return !Harness::run(specification);
 }
 
-#endif // !DEVICE_WATCHDOG || !defined(MBED_CONF_RTOS_PRESENT)
+#endif // !DEVICE_WATCHDOG
+#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/mbed_hal/watchdog_reset/main.cpp

@@ -14,8 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if !DEVICE_WATCHDOG || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] Watchdog test not supported.
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] Watchdog reset test cases requires RTOS to run.
+#else
+
+#if !DEVICE_WATCHDOG
+#error [NOT_SUPPORTED] Watchdog not supported for this target
 #else
 
 #include "greentea-client/test_env.h"
@@ -320,4 +324,5 @@ int main()
     return !Harness::run(specification);
 }
 
-#endif // !DEVICE_WATCHDOG || !defined(MBED_CONF_RTOS_PRESENT)
+#endif // !DEVICE_WATCHDOG
+#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/mbed_platform/crash_reporting/main.cpp

@@ -13,16 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if !MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] crash_reporting test not supported
+#if !defined(MBED_CONF_RTOS_PRESENT)
+#error [NOT_SUPPORTED] crash_reporting test cases requires RTOS to run.
 #else
-
 #include "mbed.h"
 #include "mbed_error.h"
 #include "mbed_crash_data_offsets.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"
 
+#if !MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED
+#error [NOT_SUPPORTED] crash_reporting test not supported
+#else
+
 #define MSG_VALUE_DUMMY "0"
 #define MSG_VALUE_LEN 32
 #define MSG_KEY_LEN 64
@@ -79,4 +82,5 @@ int main(void)
     return 0;
 }
 
-#endif // !MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED || !defined(MBED_CONF_RTOS_PRESENT)
+#endif // !MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED
+#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/mbedmicro-rtos-mbed/MemoryPool/main.cpp

@@ -19,7 +19,7 @@
 #include "utest.h"
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] test not supported
+#error [NOT_SUPPORTED] MemoryPool test cases requires RTOS to run.
 #else
 
 using namespace utest::v1;

TESTS/mbedmicro-rtos-mbed/kernel_tick_count/main.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] test not supported
+#error [NOT_SUPPORTED] kernel tick count test cases requires RTOS to run.
 #else
 
 #include "greentea-client/test_env.h"

TESTS/mbedmicro-rtos-mbed/systimer/main.cpp

@@ -20,7 +20,7 @@
 #include "utest.h"
 #include "ticker_api.h"
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] test not supported
+#error [NOT_SUPPORTED] systimer test cases requires RTOS to run.
 #else
 
 extern "C" {

TESTS/mbedtls/selftest/main.cpp

@@ -18,9 +18,7 @@
 #include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "rtos.h"
-#endif
 
 using namespace utest::v1;
 

TESTS/netsocket/dns/asynchronous_dns.cpp

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
-
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -42,4 +40,3 @@ void ASYNCHRONOUS_DNS()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif

TESTS/netsocket/dns/asynchronous_dns_cache.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -67,4 +66,3 @@ void ASYNCHRONOUS_DNS_CACHE()
                dns_test_hosts[0], data.addr.get_ip_address(), delay_ms);
     }
 }
-#endif

TESTS/netsocket/dns/asynchronous_dns_cancel.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -87,4 +86,3 @@ void ASYNCHRONOUS_DNS_CANCEL()
 
     ThisThread::sleep_for(5000);
 }
-#endif // #if defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/asynchronous_dns_external_event_queue.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -77,4 +76,3 @@ void ASYNCHRONOUS_DNS_EXTERNAL_EVENT_QUEUE()
 
     nsapi_dns_call_in_set(0);
 }
-#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/asynchronous_dns_invalid_host.cpp

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
-
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -66,4 +64,3 @@ void ASYNCHRONOUS_DNS_INVALID_HOST()
     TEST_ASSERT(result_dns_failure == exp_dns_failure || result_dns_failure == exp_dns_failure + 1);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/asynchronous_dns_non_async_and_async.cpp

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
-
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -58,4 +56,3 @@ void ASYNCHRONOUS_DNS_NON_ASYNC_AND_ASYNC()
 
     TEST_ASSERT(strlen(data.addr.get_ip_address()) > 1);
 }
-#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/asynchronous_dns_simultaneous.cpp

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
-
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -43,4 +41,3 @@ void ASYNCHRONOUS_DNS_SIMULTANEOUS()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif

TESTS/netsocket/dns/asynchronous_dns_simultaneous_cache.cpp

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
-
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -44,4 +42,3 @@ void ASYNCHRONOUS_DNS_SIMULTANEOUS_CACHE()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif

TESTS/netsocket/dns/asynchronous_dns_simultaneous_repeat.cpp

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
-
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -46,4 +44,3 @@ void ASYNCHRONOUS_DNS_SIMULTANEOUS_REPEAT()
         TEST_ASSERT_EQUAL(0, result_exp_timeout);
     }
 }
-#endif

TESTS/netsocket/dns/asynchronous_dns_timeouts.cpp

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
-
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -71,4 +69,3 @@ void ASYNCHRONOUS_DNS_TIMEOUTS()
 
     nsapi_dns_call_in_set(0);
 }
-#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/dns_tests.h

@@ -17,7 +17,6 @@
 
 #ifndef DNS_TESTS_H
 #define DNS_TESTS_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "nsapi_dns.h"
 
@@ -93,5 +92,4 @@ void SYNCHRONOUS_DNS();
 void SYNCHRONOUS_DNS_MULTIPLE();
 void SYNCHRONOUS_DNS_CACHE();
 void SYNCHRONOUS_DNS_INVALID();
-#endif /* defined(MBED_CONF_RTOS_PRESENT) */
 #endif

TESTS/netsocket/dns/main.cpp

@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] Test not supported.
-#else
-
 #define WIFI 2
 #if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || \
     (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
@@ -219,4 +215,3 @@ int main()
 }
 
 #endif // !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
-#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/synchronous_dns.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -41,4 +40,3 @@ void SYNCHRONOUS_DNS()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif

TESTS/netsocket/dns/synchronous_dns_cache.cpp

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
-
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -56,4 +54,3 @@ void SYNCHRONOUS_DNS_CACHE()
                dns_test_hosts[0], address.get_ip_address(), delay_ms);
     }
 }
-#endif

TESTS/netsocket/dns/synchronous_dns_invalid.cpp

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
-
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -61,4 +59,3 @@ void SYNCHRONOUS_DNS_INVALID()
     TEST_ASSERT_EQUAL(expected_failures, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif

TESTS/netsocket/dns/synchronous_dns_multiple.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -41,4 +40,3 @@ void SYNCHRONOUS_DNS_MULTIPLE()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif

TESTS/netsocket/tcp/main.cpp

@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] NVSTORE needs to be enabled for this test
-#else
-
 #define WIFI 2
 #if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || \
     (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
@@ -244,4 +240,3 @@ int main()
 
 #endif // ECHO_SERVER_ADDR
 #endif // !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
-#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcp_tests.h

@@ -17,7 +17,6 @@
 
 #ifndef TCP_TESTS_H
 #define TCP_TESTS_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "../test_params.h"
 
@@ -89,4 +88,3 @@ void TCPSOCKET_THREAD_PER_SOCKET_SAFETY();
 void TCPSOCKET_SETSOCKOPT_KEEPALIVE_VALID();
 
 #endif //TCP_TESTS_H
-#endif //!defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_bind_address.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "tcp_tests.h"
@@ -44,4 +43,3 @@ void TCPSOCKET_BIND_ADDRESS()
 
     delete sock;
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
-
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "tcp_tests.h"
@@ -51,4 +49,3 @@ void TCPSOCKET_BIND_ADDRESS_INVALID()
 
     delete sock;
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "tcp_tests.h"
@@ -43,4 +42,3 @@ void TCPSOCKET_BIND_ADDRESS_NULL()
 
     delete sock;
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "tcp_tests.h"
@@ -43,4 +42,3 @@ void TCPSOCKET_BIND_ADDRESS_PORT()
 
     delete sock;
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_bind_port.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "tcp_tests.h"
@@ -43,4 +42,3 @@ void TCPSOCKET_BIND_PORT()
 
     delete sock;
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "tcp_tests.h"
@@ -53,4 +52,3 @@ void TCPSOCKET_BIND_PORT_FAIL()
     delete sock;
     delete sock2;
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "tcp_tests.h"
@@ -42,4 +41,3 @@ void TCPSOCKET_BIND_UNOPENED()
 
     delete sock;
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "tcp_tests.h"
@@ -52,4 +51,3 @@ void TCPSOCKET_BIND_WRONG_TYPE()
 
     delete sock;
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "mbed.h"
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
@@ -38,4 +37,3 @@ void TCPSOCKET_CONNECT_INVALID()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_echotest.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "mbed.h"
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
@@ -202,4 +201,3 @@ END:
     tc_exec_time.stop();
     free(stack_mem);
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "mbed.h"
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
@@ -142,4 +141,3 @@ void TCPSOCKET_ECHOTEST_BURST_NONBLOCK()
 END:
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_endpoint_close.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "mbed.h"
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
@@ -89,4 +88,3 @@ void TCPSOCKET_ENDPOINT_CLOSE()
     tc_exec_time.stop();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "tcp_tests.h"
@@ -39,4 +38,3 @@ void TCPSOCKET_OPEN_CLOSE_REPEAT()
     }
     delete sock;
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_open_destruct.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "tcp_tests.h"
@@ -37,4 +36,3 @@ void TCPSOCKET_OPEN_DESTRUCT()
         delete sock;
     }
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_open_limit.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "tcp_tests.h"
@@ -97,4 +96,3 @@ void TCPSOCKET_OPEN_LIMIT()
     TEST_ASSERT_EQUAL(open_sockets[0], open_sockets[1]);
     TEST_ASSERT(open_sockets[0] >= 4);
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_open_twice.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "tcp_tests.h"
@@ -38,4 +37,3 @@ void TCPSOCKET_OPEN_TWICE()
 
     delete sock;
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "mbed.h"
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
@@ -196,4 +195,3 @@ void TCPSOCKET_RECV_100K_NONBLOCK()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "mbed.h"
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
@@ -89,4 +88,3 @@ CLEANUP:
     tc_exec_time.stop();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_send_repeat.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "mbed.h"
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
@@ -44,4 +43,3 @@ void TCPSOCKET_SEND_REPEAT()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_send_timeout.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "mbed.h"
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
@@ -53,4 +52,3 @@ void TCPSOCKET_SEND_TIMEOUT()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_setsockopt_keepalive_valid.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "mbed.h"
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
@@ -50,4 +49,3 @@ void TCPSOCKET_SETSOCKOPT_KEEPALIVE_VALID()
     //    TEST_ASSERT_EQUAL(optval, seconds);
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif

TESTS/netsocket/tcp/tcpsocket_thread_per_socket_safety.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 #include "mbed.h"
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
@@ -168,4 +167,3 @@ void TCPSOCKET_THREAD_PER_SOCKET_SAFETY()
     running = false;
     thread.join();
 }
-#endif

TESTS/netsocket/tls/main.cpp

@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] test not supported
-#else
 #define WIFI 2
 #if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || \
     (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
@@ -254,4 +251,3 @@ int main()
 
 #endif // ECHO_SERVER_ADDR
 #endif // !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
-#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tls/tls_tests.h

@@ -17,7 +17,6 @@
 
 #ifndef TLS_TESTS_H
 #define TLS_TESTS_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "../test_params.h"
 #include "TLSSocket.h"
@@ -84,5 +83,5 @@ void TLSSOCKET_SIMULTANEOUS();
 void TLSSOCKET_SEND_TIMEOUT();
 
 #endif // defined(MBEDTLS_SSL_CLI_C) || defined(DOXYGEN_ONLY)
-#endif
+
 #endif //TLS_TESTS_H

TESTS/netsocket/udp/main.cpp

@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] test not supported.
-#else
-
 #define WIFI 2
 #if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || \
     (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
@@ -208,4 +204,3 @@ int main()
 
 #endif // ECHO_SERVER_ADDR
 #endif // !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
-#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/emac/emac_TestMemoryManager.cpp

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
@@ -554,4 +554,3 @@ EmacTestMemoryManager &EmacTestMemoryManager::get_instance()
     return test_memory_manager;
 }
 
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/emac/emac_TestMemoryManager.h

@@ -17,7 +17,6 @@
 
 #ifndef EMAC_TEST_MEMORY_MANAGER_H
 #define EMAC_TEST_MEMORY_MANAGER_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include <list>
 
@@ -226,5 +225,5 @@ private:
     unsigned int m_alloc_unit;
     bool m_memory_available;
 };
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_TEST_MEMORY_MANAGER_H */

TESTS/network/emac/emac_TestNetworkStack.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "unity.h"
 
@@ -203,5 +202,4 @@ OnboardNetworkStack &OnboardNetworkStack::get_default_instance()
 {
     return EmacTestNetworkStack::get_instance();
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
 #endif

TESTS/network/emac/emac_TestNetworkStack.h

@@ -17,7 +17,6 @@
 
 #ifndef EMAC_TEST_NETWORK_STACK_H
 #define EMAC_TEST_NETWORK_STACK_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "netsocket/nsapi_types.h"
 #include "netsocket/EMAC.h"
@@ -388,5 +387,5 @@ private:
 
     Interface *m_interface;
 };
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_TEST_NETWORK_STACK_H */

TESTS/network/emac/emac_ctp.cpp

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
+
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"
 #include "utest.h"
@@ -149,5 +149,5 @@ void emac_if_ctp_msg_build(int eth_frame_len, const unsigned char *dest_addr, co
     emac_if_get()->link_out(buf);
     emac_if_check_memory(false);
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+
 

TESTS/network/emac/emac_ctp.h

@@ -17,7 +17,7 @@
 
 #ifndef EMAC_CTP_H
 #define EMAC_CTP_H
-#if defined(MBED_CONF_RTOS_PRESENT)
+
 enum ctp_function {
     CTP_NONE,
     CTP_FORWARD,
@@ -37,5 +37,5 @@ enum ctp_function {
 ctp_function emac_if_ctp_header_handle(unsigned char *eth_input_frame, unsigned char *eth_output_frame, unsigned char *origin_addr, int *receipt_number);
 void emac_if_ctp_msg_build(int eth_frame_len, const unsigned char *dest_addr, const unsigned char *origin_addr, const unsigned char *forward_addr, int options);
 void emac_if_ctp_reply_handle(int lenght, int invalid_data_index);
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_CTP_H */

TESTS/network/emac/emac_initialize.h

@@ -17,11 +17,10 @@
 
 #ifndef EMAC_INITIALIZE_H
 #define EMAC_INITIALIZE_H
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 unsigned char *emac_if_get_hw_addr(void);
 bool emac_if_init(EMAC *emac);
 EMAC *emac_if_get(void);
 EmacTestMemoryManager *emac_m_mngr_get(void);
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_INITIALIZE_H */

TESTS/network/emac/emac_membuf.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -76,4 +75,3 @@ void emac_if_memory_buffer_write(void *buf, unsigned char *eth_frame, bool write
         }
     }
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/emac/emac_membuf.h

@@ -17,8 +17,8 @@
 
 #ifndef EMAC_MEMBUF_H
 #define EMAC_MEMBUF_H
-#if defined(MBED_CONF_RTOS_PRESENT)
+
 int emac_if_memory_buffer_read(void *buf, unsigned char *eth_frame);
 void emac_if_memory_buffer_write(void *buf, unsigned char *eth_frame, bool write_data);
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_MEMBUF_H */

TESTS/network/emac/emac_test_broadcast.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -100,4 +99,3 @@ void test_emac_broadcast(void)
     RESET_OUTGOING_MSG_DATA;
 }
 
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/emac/emac_test_initialize.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include <inttypes.h>
 #include "mbed.h"
@@ -118,4 +117,3 @@ bool emac_if_init(EMAC *emac)
 
     return true;
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/emac/emac_test_memory.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -162,4 +161,3 @@ void test_emac_memory()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/emac/emac_test_multicast_filter.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -172,5 +171,3 @@ void test_emac_multicast_filter()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
-
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/emac/emac_test_unicast.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -77,4 +76,3 @@ void test_emac_unicast()
     RESET_OUTGOING_MSG_DATA;
 }
 
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/emac/emac_test_unicast_burst.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -85,5 +84,3 @@ void test_emac_unicast_burst()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
-
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/emac/emac_test_unicast_frame_len.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -80,4 +79,3 @@ void test_emac_unicast_frame_len()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/emac/emac_test_unicast_long.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -82,4 +81,3 @@ void test_emac_unicast_long()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/emac/emac_tests.h

@@ -17,7 +17,7 @@
 
 #ifndef EMAC_TESTS_H
 #define EMAC_TESTS_H
-#if defined(MBED_CONF_RTOS_PRESENT)
+
 void test_emac_initialize();
 void test_emac_broadcast();
 void test_emac_unicast();
@@ -26,5 +26,5 @@ void test_emac_unicast_burst();
 void test_emac_unicast_long();
 void test_emac_multicast_filter();
 void test_emac_memory();
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_TESTS_H */

TESTS/network/emac/emac_util.cpp

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -583,4 +582,3 @@ void emac_if_set_mtu_size(int mtu_size)
 {
     eth_mtu_size = mtu_size;
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/emac/emac_util.h

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #ifndef EMAC_UTIL_H
 #define EMAC_UTIL_H
@@ -125,5 +124,5 @@ void worker_loop_init(void);
 void worker_loop_start(void (*test_step_cb_fnc)(int opt), int timeout);
 void worker_loop_end(void);
 void worker_loop_link_up_wait(void);
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_UTIL_H */

TESTS/network/emac/main.cpp

@@ -14,9 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] EMAC test cases are not supported on Bare metal
-#else
 
 #if !defined(MBED_CONF_APP_ECHO_SERVER)       || \
     !defined(MBED_CONF_APP_ECHO_SERVER_TRACE) || \
@@ -93,4 +90,3 @@ int main()
 
 #endif // MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE != ETHERNET && MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE != WIFI
 #endif // !defined(MBED_CONF_APP_ECHO_SERVER) || !defined(MBED_CONF_APP_ECHO_SERVER_TRACE) || !defined(MBED_CONF_APP_WIFI_SCAN)
-#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/interface/main.cpp

@@ -15,10 +15,6 @@
  * limitations under the License.
  */
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] test not supported.
-#else
-
 #define WIFI 2
 #if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || \
     (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
@@ -60,4 +56,3 @@ int main()
 }
 
 #endif // !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
-#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/network/l3ip/cellular_driver_l3ip.cpp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "mbed_interface.h"
 #include "netsocket/nsapi_types.h"
@@ -113,7 +112,7 @@ MBED_WEAK L3IP &L3IP::get_default_instance()
 {
     return Cellular_driver_L3IP::get_instance();
 }
-#endif
+
 /**
  * @}
  */

TESTS/network/l3ip/cellular_driver_l3ip.h

@@ -17,7 +17,6 @@
 
 #ifndef CELLULAR_DRIVER_L3IP_H_
 #define CELLULAR_DRIVER_L3IP_H_
-#if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "L3IP.h"
 
@@ -134,4 +133,3 @@ private:
 };
 
 #endif /* CELLULAR_DRIVER_L3IP_H_ */
-#endif

TESTS/network/l3ip/main.cpp

@@ -14,9 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] l3ip test cases are not supported on Bare metal
-#else
+
 
 #include "mbed.h"
 #include "greentea-client/test_env.h"
@@ -80,4 +78,3 @@ int main()
 {
     return !Harness::run(specification);
 }
-#endif

TESTS/psa/attestation/main.cpp

@@ -16,10 +16,6 @@
 * limitations under the License.
 */
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] test not supported.
-#else
-
 #include "psa/crypto.h"
 
 #if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
@@ -161,4 +157,3 @@ int main()
 }
 
 #endif // ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
-#endif // !defined(MBED_CONF_RTOS_PRESENT)

TESTS/psa/its_ps/main.cpp

@@ -16,8 +16,8 @@
 * limitations under the License.
 */
 
-#if !defined(TARGET_PSA) || !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] ITS/PS tests can run only on PSA-enabled targets and RTOS.
+#ifndef TARGET_PSA
+#error [NOT_SUPPORTED] ITS/PS tests can run only on PSA-enabled targets.
 #else
 
 #include "greentea-client/test_env.h"
@@ -238,4 +238,4 @@ int main()
     return !Harness::run(specification);
 }
 
-#endif // TARGET_PSA || !defined(MBED_CONF_RTOS_PRESENT)
+#endif // TARGET_PSA

TESTS/usb_device/basic/main.cpp

@@ -16,7 +16,7 @@
  */
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] USB test cases are not supported on Bare metal
+#error [NOT_SUPPORTED] USB test cases requires RTOS to run.
 #else
 
 #include <stdio.h>

components/TARGET_PSA/TESTS/compliance_attestation/test_a001/main.c

@@ -1,13 +1,9 @@
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA attestation test not supported
-#else
 void test_entry_a001(val_api_t *val_api, psa_api_t *psa_api); 
 
 int main(void)
 {
     test_start(test_entry_a001, COMPLIANCE_TEST_ATTESTATION);
 }
-#endif

components/TARGET_PSA/TESTS/compliance_its/test_s001/main.c

@@ -1,10 +1,6 @@
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test not supported
-#else
-
 #ifdef ITS_TEST
 void test_entry_s001(val_api_t *val_api, psa_api_t *psa_api);
 #elif PS_TEST
@@ -19,4 +15,3 @@ int main(void)
     test_start(test_entry_p001, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif

components/TARGET_PSA/TESTS/compliance_its/test_s002/main.c

@@ -1,9 +1,6 @@
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 #include "lifecycle.h"
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test not supported
-#else
 
 #ifdef ITS_TEST
 void test_entry_s002(val_api_t *val_api, psa_api_t *psa_api);
@@ -19,4 +16,3 @@ int main(void)
     test_start(test_entry_p002, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif

components/TARGET_PSA/TESTS/compliance_its/test_s004/main.c

@@ -1,8 +1,5 @@
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test not supported
-#else
 
 #ifdef ITS_TEST
 void test_entry_s004(val_api_t *val_api, psa_api_t *psa_api);
@@ -18,4 +15,3 @@ int main(void)
     test_start(test_entry_p004, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif

components/TARGET_PSA/TESTS/compliance_its/test_s005/main.c

@@ -1,10 +1,6 @@
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test not supported
-#else
-
 #ifdef ITS_TEST
 void test_entry_s005(val_api_t *val_api, psa_api_t *psa_api);
 #elif PS_TEST
@@ -19,4 +15,3 @@ int main(void)
     test_start(test_entry_p005, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif

components/TARGET_PSA/TESTS/compliance_its/test_s006/main.c

@@ -1,10 +1,6 @@
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test not supported
-#else
-
 #ifdef ITS_TEST
 void test_entry_s006(val_api_t *val_api, psa_api_t *psa_api);
 #elif PS_TEST
@@ -19,4 +15,3 @@ int main(void)
     test_start(test_entry_p006, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif

components/TARGET_PSA/TESTS/compliance_its/test_s007/main.c

@@ -1,10 +1,6 @@
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test not supported
-#else
-
 #ifdef ITS_TEST
 void test_entry_s007(val_api_t *val_api, psa_api_t *psa_api);
 #elif PS_TEST
@@ -19,4 +15,3 @@ int main(void)
     test_start(test_entry_p007, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif

components/TARGET_PSA/TESTS/compliance_its/test_s008/main.c

@@ -1,10 +1,6 @@
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test not supported
-#else
-
 #ifdef ITS_TEST
 void test_entry_s008(val_api_t *val_api, psa_api_t *psa_api);
 #elif PS_TEST
@@ -19,4 +15,3 @@ int main(void)
     test_start(test_entry_p008, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif

components/TARGET_PSA/TESTS/compliance_its/test_s009/main.c

@@ -1,10 +1,6 @@
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test not supported
-#else
-
 #ifdef ITS_TEST
 void test_entry_s009(val_api_t *val_api, psa_api_t *psa_api);
 #elif PS_TEST
@@ -19,4 +15,3 @@ int main(void)
     test_start(test_entry_p009, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif

components/TARGET_PSA/TESTS/compliance_its/test_s010/main.c

@@ -1,10 +1,6 @@
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
-#if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] PSA compliance its test not supported
-#else
-
 #ifdef ITS_TEST
 void test_entry_s010(val_api_t *val_api, psa_api_t *psa_api);
 #elif PS_TEST
@@ -19,4 +15,3 @@ int main(void)
     test_start(test_entry_p010, COMPLIANCE_TEST_STORAGE);
 #endif
 }
-#endif