Merge pull request #12498 from jamesbeyond/usb_test

TEST: update usb tests and guard them with macro

TESTS/usb_device/README.md

@@ -68,9 +68,9 @@ No setup method has been verified for this platform.
 
 ## Running tests
 1.  Plug both USB interfaces (*DAPLink* and *USB device*) to your host machine.
-1.  Run tests:
+1. An addtional macro `USB_DEVICE_TESTS` is needed to be defined when runing tests:
     ```
-    mbed test -t <toolchain> -m <target> -n tests-usb_device-*
+    mbed test -t <toolchain> -m <target> -DUSB_DEVICE_TESTS -n tests-usb_device-*
     ```
 
 ## Known issues

TESTS/usb_device/basic/USBEndpointTester.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2018, ARM Limited, All Rights Reserved
+ * Copyright (c) 2018-2020, ARM Limited, All Rights Reserved
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#if USB_DEVICE_TESTS
+
 #if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "stdint.h"
@@ -863,3 +865,4 @@ void USBEndpointTester::start_ep_in_abort_test()
     write_start(_endpoints[EP_INT_IN], _endpoint_buffs[EP_INT_IN], (*_endpoint_configs)[EP_INT_IN].max_packet);
 }
 #endif
+#endif //USB_DEVICE_TESTS

TESTS/usb_device/basic/USBTester.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2018, ARM Limited, All Rights Reserved
+ * Copyright (c) 2018-2020, ARM Limited, All Rights Reserved
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#if USB_DEVICE_TESTS
+
 #if defined(MBED_CONF_RTOS_PRESENT)
 
 #include "stdint.h"
@@ -705,3 +707,4 @@ void USBTester::epbulk_out_callback()
     read_start(bulk_out, bulk_buf, sizeof(bulk_buf));
 }
 #endif
+#endif //USB_DEVICE_TESTS

TESTS/usb_device/basic/main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2018, ARM Limited, All Rights Reserved
+ * Copyright (c) 2018-2020, ARM Limited, All Rights Reserved
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -15,6 +15,10 @@
  * limitations under the License.
  */
 
+#if !USB_DEVICE_TESTS
+#error [NOT_SUPPORTED] usb device tests not enabled
+#else
+
 #if !defined(MBED_CONF_RTOS_PRESENT)
 #error [NOT_SUPPORTED] USB stack and test cases require RTOS to run.
 #else
@@ -666,3 +670,4 @@ int main()
 
 #endif // !defined(DEVICE_USBDEVICE) || !DEVICE_USBDEVICE
 #endif // !defined(MBED_CONF_RTOS_PRESENT)
+#endif // !defined(USB_DEVICE_TESTS)

TESTS/usb_device/hid/main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, ARM Limited, All Rights Reserved
+ * Copyright (c) 2018-2020, ARM Limited, All Rights Reserved
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,6 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#if !USB_DEVICE_TESTS
+#error [NOT_SUPPORTED] usb device tests not enabled
+#else
+
 #if !defined(MBED_CONF_RTOS_PRESENT)
 #error [NOT_SUPPORTED] USB stack and test cases require RTOS to run.
 #else
@@ -389,3 +394,4 @@ int main()
 
 #endif // !defined(DEVICE_USBDEVICE) || !DEVICE_USBDEVICE
 #endif // !defined(MBED_CONF_RTOS_PRESENT)
+#endif // !defined(USB_DEVICE_TESTS)

TESTS/usb_device/msd/main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited and affiliates.
+ * Copyright (c) 2019-2020, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,10 @@
  * limitations under the License.
  */
 
+#if !USB_DEVICE_TESTS
+#error [NOT_SUPPORTED] usb device tests not enabled
+#else
+
 #if !defined(MBED_CONF_RTOS_PRESENT)
 #error [NOT_SUPPORTED] USB stack and test cases require RTOS to run.
 #else
@@ -488,3 +492,4 @@ int main()
 
 #endif // !defined(DEVICE_USBDEVICE) || !DEVICE_USBDEVICE
 #endif // !defined(MBED_CONF_RTOS_PRESENT)
+#endif // !defined(USB_DEVICE_TESTS)

TESTS/usb_device/serial/main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, ARM Limited, All Rights Reserved
+ * Copyright (c) 2018-2020, ARM Limited, All Rights Reserved
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -14,6 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#if !USB_DEVICE_TESTS
+#error [NOT_SUPPORTED] usb device tests not enabled
+#else
+
 #if !defined(MBED_CONF_RTOS_PRESENT)
 #error [NOT_SUPPORTED] USB stack and test cases require RTOS to run.
 #else
@@ -853,3 +858,4 @@ int main()
 
 #endif // !defined(DEVICE_USBDEVICE) || !DEVICE_USBDEVICE
 #endif // !defined(MBED_CONF_RTOS_PRESENT)
+#endif // !defined(USB_DEVICE_TESTS)