Incorporated review comments

Author: rajkan01

TESTS/lorawan/loraradio/main.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] LORADIO test cases requires RTOS to run.
+#error [NOT_SUPPORTED] LORADIO test cases require a RTOS to run.
 #else
 
 #include "utest.h"

TESTS/netsocket/dns/asynchronous_dns.cpp

@@ -42,4 +42,4 @@ void ASYNCHRONOUS_DNS()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/asynchronous_dns_cache.cpp

@@ -67,4 +67,4 @@ void ASYNCHRONOUS_DNS_CACHE()
                dns_test_hosts[0], data.addr.get_ip_address(), delay_ms);
     }
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/asynchronous_dns_cancel.cpp

@@ -87,4 +87,4 @@ void ASYNCHRONOUS_DNS_CANCEL()
 
     ThisThread::sleep_for(5000);
 }
-#endif // #if defined(MBED_CONF_RTOS_PRESENT)
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/asynchronous_dns_simultaneous.cpp

@@ -43,4 +43,4 @@ void ASYNCHRONOUS_DNS_SIMULTANEOUS()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/asynchronous_dns_simultaneous_cache.cpp

@@ -44,4 +44,4 @@ void ASYNCHRONOUS_DNS_SIMULTANEOUS_CACHE()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/asynchronous_dns_simultaneous_repeat.cpp

@@ -46,4 +46,4 @@ void ASYNCHRONOUS_DNS_SIMULTANEOUS_REPEAT()
         TEST_ASSERT_EQUAL(0, result_exp_timeout);
     }
 }
-#endif
+#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

@@ -16,7 +16,7 @@
  */
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] dns test cases requires RTOS to run.
+#error [NOT_SUPPORTED] dns test cases require a RTOS to run.
 #else
 
 #define WIFI 2

TESTS/netsocket/dns/synchronous_dns.cpp

@@ -41,4 +41,4 @@ void SYNCHRONOUS_DNS()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/synchronous_dns_cache.cpp

@@ -56,4 +56,4 @@ void SYNCHRONOUS_DNS_CACHE()
                dns_test_hosts[0], address.get_ip_address(), delay_ms);
     }
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/synchronous_dns_invalid.cpp

@@ -61,4 +61,4 @@ void SYNCHRONOUS_DNS_INVALID()
     TEST_ASSERT_EQUAL(expected_failures, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/dns/synchronous_dns_multiple.cpp

@@ -41,4 +41,4 @@ void SYNCHRONOUS_DNS_MULTIPLE()
     TEST_ASSERT_EQUAL(0, result_dns_failure);
     TEST_ASSERT_EQUAL(0, result_exp_timeout);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/main.cpp

@@ -16,7 +16,7 @@
  */
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] tcp test cases requires RTOS to run
+#error [NOT_SUPPORTED] tcp test cases require a RTOS to run
 #else
 
 #define WIFI 2

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

@@ -44,4 +44,4 @@ void TCPSOCKET_BIND_ADDRESS()
 
     delete sock;
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp

@@ -51,4 +51,4 @@ void TCPSOCKET_BIND_ADDRESS_INVALID()
 
     delete sock;
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp

@@ -43,4 +43,4 @@ void TCPSOCKET_BIND_ADDRESS_NULL()
 
     delete sock;
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp

@@ -43,4 +43,4 @@ void TCPSOCKET_BIND_ADDRESS_PORT()
 
     delete sock;
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_bind_port.cpp

@@ -43,4 +43,4 @@ void TCPSOCKET_BIND_PORT()
 
     delete sock;
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp

@@ -53,4 +53,4 @@ void TCPSOCKET_BIND_PORT_FAIL()
     delete sock;
     delete sock2;
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp

@@ -42,4 +42,4 @@ void TCPSOCKET_BIND_UNOPENED()
 
     delete sock;
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp

@@ -52,4 +52,4 @@ void TCPSOCKET_BIND_WRONG_TYPE()
 
     delete sock;
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp

@@ -38,4 +38,4 @@ void TCPSOCKET_CONNECT_INVALID()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_echotest.cpp

@@ -202,4 +202,4 @@ void TCPSOCKET_ECHOTEST_NONBLOCK()
     tc_exec_time.stop();
     free(stack_mem);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp

@@ -142,4 +142,4 @@ void TCPSOCKET_ECHOTEST_BURST_NONBLOCK()
 END:
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_endpoint_close.cpp

@@ -89,4 +89,4 @@ void TCPSOCKET_ENDPOINT_CLOSE()
     tc_exec_time.stop();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp

@@ -39,4 +39,4 @@ void TCPSOCKET_OPEN_CLOSE_REPEAT()
     }
     delete sock;
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_open_destruct.cpp

@@ -37,4 +37,4 @@ void TCPSOCKET_OPEN_DESTRUCT()
         delete sock;
     }
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_open_limit.cpp

@@ -97,4 +97,4 @@ void TCPSOCKET_OPEN_LIMIT()
     TEST_ASSERT_EQUAL(open_sockets[0], open_sockets[1]);
     TEST_ASSERT(open_sockets[0] >= 4);
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_open_twice.cpp

@@ -38,4 +38,4 @@ void TCPSOCKET_OPEN_TWICE()
 
     delete sock;
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp

@@ -196,4 +196,4 @@ void TCPSOCKET_RECV_100K_NONBLOCK()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp

@@ -89,4 +89,4 @@ void TCPSOCKET_RECV_TIMEOUT()
     tc_exec_time.stop();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_send_repeat.cpp

@@ -44,4 +44,4 @@ void TCPSOCKET_SEND_REPEAT()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_send_timeout.cpp

@@ -53,4 +53,4 @@ void TCPSOCKET_SEND_TIMEOUT()
 
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_setsockopt_keepalive_valid.cpp

@@ -50,4 +50,4 @@ void TCPSOCKET_SETSOCKOPT_KEEPALIVE_VALID()
     //    TEST_ASSERT_EQUAL(optval, seconds);
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tcp/tcpsocket_thread_per_socket_safety.cpp

@@ -168,4 +168,4 @@ void TCPSOCKET_THREAD_PER_SOCKET_SAFETY()
     running = false;
     thread.join();
 }
-#endif
+#endif // defined(MBED_CONF_RTOS_PRESENT)

TESTS/netsocket/tls/main.cpp

@@ -16,7 +16,7 @@
  */
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] tls test cases requires RTOS to run
+#error [NOT_SUPPORTED] tls test cases require a RTOS to run
 #else
 #define WIFI 2
 #if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || \

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 // !defined(MBED_CONF_RTOS_PRESENT)
+
 #endif //TLS_TESTS_H

TESTS/netsocket/udp/main.cpp

@@ -16,7 +16,7 @@
  */
 
 #if !defined(MBED_CONF_RTOS_PRESENT)
-#error [NOT_SUPPORTED] udp test cases requires RTOS to run.
+#error [NOT_SUPPORTED] udp test cases require a RTOS to run.
 #else
 
 #define WIFI 2

TESTS/network/emac/emac_TestMemoryManager.cpp

@@ -554,4 +554,4 @@ EmacTestMemoryManager &EmacTestMemoryManager::get_instance()
     return test_memory_manager;
 }
 
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // 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 @@ 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 */

TESTS/network/emac/emac_TestNetworkStack.cpp

@@ -203,5 +203,5 @@ OnboardNetworkStack &OnboardNetworkStack::get_default_instance()
 {
     return EmacTestNetworkStack::get_instance();
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // 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 @@ class EmacTestNetworkStack : public OnboardNetworkStack, private mbed::NonCopyab
 
     Interface *m_interface;
 };
-#endif /* #if defined(MBED_CONF_RTOS_PRESENT) */
+
 #endif /* EMAC_TEST_NETWORK_STACK_H */

TESTS/network/emac/emac_ctp.cpp

@@ -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)
+#endif // 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

@@ -76,4 +76,4 @@ void emac_if_memory_buffer_write(void *buf, unsigned char *eth_frame, bool write
         }
     }
 }
-#endif //#if defined(MBED_CONF_RTOS_PRESENT)
+#endif // 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 */