fixed the below build issue

rajkan01 · rajkan01 · commit 683b73f17216 · 2019-11-05T08:49:27.000-08:00
- Emac
 - NFC-EEPROM
 - PSA-CRYPTO
diff --git a/TESTS/configs/baremetal.json b/TESTS/configs/baremetal.json
@@ -12,6 +12,14 @@
         "littlefs",
         "mbed-trace",
         "device-key",
-        "lora"
-    ] 
+        "lora",
+	"nfc",
+	"network-emac",
+	"nanostack-libservice"
+    ],
+    "target_overrides": {
+        "*": {
+	    "target.device_has_remove": ["EMAC"]
+        }
+     }
 }
diff --git a/TESTS/network/emac/emac_TestMemoryManager.cpp b/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>
@@ -553,4 +553,4 @@ EmacTestMemoryManager &EmacTestMemoryManager::get_instance()
     static EmacTestMemoryManager test_memory_manager;
     return test_memory_manager;
 }
-
+#endif //#if defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_TestMemoryManager.h b/TESTS/network/emac/emac_TestMemoryManager.h
@@ -17,7 +17,7 @@
 
 #ifndef EMAC_TEST_MEMORY_MANAGER_H
 #define EMAC_TEST_MEMORY_MANAGER_H
-
+#if defined(MBED_CONF_RTOS_PRESENT)
 #include <list>
 
 #include "EMACMemoryManager.h"
@@ -225,5 +225,5 @@ class EmacTestMemoryManager : public EMACMemoryManager {
     unsigned int m_alloc_unit;
     bool m_memory_available;
 };
-
+#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
 #endif /* EMAC_TEST_MEMORY_MANAGER_H */
diff --git a/TESTS/network/emac/emac_TestNetworkStack.cpp b/TESTS/network/emac/emac_TestNetworkStack.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 "unity.h"
 
 #include "EMACMemoryManager.h"
@@ -202,4 +202,5 @@ OnboardNetworkStack &OnboardNetworkStack::get_default_instance()
 {
     return EmacTestNetworkStack::get_instance();
 }
+#endif //#if defined(MBED_CONF_RTOS_PRESENT)
 #endif
diff --git a/TESTS/network/emac/emac_TestNetworkStack.h b/TESTS/network/emac/emac_TestNetworkStack.h
@@ -17,7 +17,7 @@
 
 #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"
 #include "netsocket/OnboardNetworkStack.h"
@@ -387,5 +387,5 @@ class EmacTestNetworkStack : public OnboardNetworkStack, private mbed::NonCopyab
 
     Interface *m_interface;
 };
-
+#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
 #endif /* EMAC_TEST_NETWORK_STACK_H */
diff --git a/TESTS/network/emac/emac_ctp.cpp b/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)
 
diff --git a/TESTS/network/emac/emac_ctp.h b/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 */
diff --git a/TESTS/network/emac/emac_initialize.h b/TESTS/network/emac/emac_initialize.h
@@ -17,10 +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 */
diff --git a/TESTS/network/emac/emac_membuf.cpp b/TESTS/network/emac/emac_membuf.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 "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -75,3 +75,4 @@ void emac_if_memory_buffer_write(void *buf, unsigned char *eth_frame, bool write
         }
     }
 }
+#endif //#if defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_membuf.h b/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 */
diff --git a/TESTS/network/emac/emac_test_broadcast.cpp b/TESTS/network/emac/emac_test_broadcast.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 "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -99,3 +99,4 @@ void test_emac_broadcast(void)
     RESET_OUTGOING_MSG_DATA;
 }
 
+#endif //#if defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_initialize.cpp b/TESTS/network/emac/emac_test_initialize.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 <inttypes.h>
 #include "mbed.h"
 #include "mbed_stats.h"
@@ -117,3 +117,4 @@ bool emac_if_init(EMAC *emac)
 
     return true;
 }
+#endif //#if defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_memory.cpp b/TESTS/network/emac/emac_test_memory.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 "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -161,3 +161,4 @@ void test_emac_memory()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
+#endif //#if defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_multicast_filter.cpp b/TESTS/network/emac/emac_test_multicast_filter.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 "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -171,3 +171,4 @@ void test_emac_multicast_filter()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
+#endif //#if defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_unicast.cpp b/TESTS/network/emac/emac_test_unicast.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 "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -76,3 +76,4 @@ void test_emac_unicast()
     RESET_OUTGOING_MSG_DATA;
 }
 
+#endif //#if defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_unicast_burst.cpp b/TESTS/network/emac/emac_test_unicast_burst.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 "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -84,3 +84,4 @@ void test_emac_unicast_burst()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
+#endif //#if defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_unicast_frame_len.cpp b/TESTS/network/emac/emac_test_unicast_frame_len.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 "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -79,3 +79,4 @@ void test_emac_unicast_frame_len()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
+#endif //#if defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_test_unicast_long.cpp b/TESTS/network/emac/emac_test_unicast_long.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 "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -81,3 +81,4 @@ void test_emac_unicast_long()
     TEST_ASSERT_FALSE(ERROR_FLAGS);
     RESET_OUTGOING_MSG_DATA;
 }
+#endif //#if defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_tests.h b/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 */
diff --git a/TESTS/network/emac/emac_util.cpp b/TESTS/network/emac/emac_util.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 "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
@@ -582,3 +582,4 @@ void emac_if_set_mtu_size(int mtu_size)
 {
     eth_mtu_size = mtu_size;
 }
+#endif //#if defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/network/emac/emac_util.h b/TESTS/network/emac/emac_util.h
@@ -14,6 +14,7 @@
  * 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
@@ -124,5 +125,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 */
diff --git a/features/device_key/TESTS/device_key/functionality/main.cpp b/features/device_key/TESTS/device_key/functionality/main.cpp
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+#if !DEVICEKEY_ENABLED
+#error [NOT_SUPPORTED] DeviceKey needs to be enabled for this test
+#else
+
 #include "DeviceKey.h"
 #include "mbedtls/config.h"
 #include "utest/utest.h"
@@ -28,10 +32,6 @@
 using namespace utest::v1;
 using namespace mbed;
 
-#if !DEVICEKEY_ENABLED
-#error [NOT_SUPPORTED] DeviceKey needs to be enabled for this test
-#else
-
 #define MSG_VALUE_DUMMY "0"
 #define MSG_VALUE_LEN 32
 #define MSG_KEY_LEN 32
diff --git a/features/storage/nvstore/TESTS/nvstore/functionality/main.cpp b/features/storage/nvstore/TESTS/nvstore/functionality/main.cpp
@@ -14,6 +14,10 @@
 * limitations under the License.
 */
 
+#if !NVSTORE_ENABLED
+#error [NOT_SUPPORTED] NVSTORE needs to be enabled for this test
+#else
+
 #include "nvstore.h"
 #ifdef MBED_CONF_RTOS_PRESENT
 #include "Thread.h"
@@ -27,10 +31,6 @@
 #include <stdio.h>
 #include <algorithm>
 
-#if !NVSTORE_ENABLED
-#error [NOT_SUPPORTED] NVSTORE needs to be enabled for this test
-#else
-
 using namespace utest::v1;
 
 static const uint16_t max_test_keys = 20;

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* See the License for the specific language governing permissions and`
`15`	`15`	`* limitations under the License.`
`16`	`16`	`*/`
`17`		`-`
	`17`	`+#if defined(MBED_CONF_RTOS_PRESENT)`
`18`	`18`	`#include "unity.h"`
`19`	`19`
`20`	`20`	`#include "EMACMemoryManager.h"`
`@@ -202,4 +202,5 @@ OnboardNetworkStack &OnboardNetworkStack::get_default_instance()`
`202`	`202`	`{`
`203`	`203`	`return EmacTestNetworkStack::get_instance();`
`204`	`204`	`}`
	`205`	`+#endif //#if defined(MBED_CONF_RTOS_PRESENT)`
`205`	`206`	`#endif`