-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

Author: rajkan01

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)