Fixing .astyleignore conflict

Author: Ashok Rao

.astyleignore

@@ -20,6 +20,7 @@
 ^hal/storage_abstraction
 ^platform/cxxsupport
 ^platform/tests/UNITTESTS
+^events/tests/UNITTESTS
 ^rtos/source/TARGET_CORTEX/rtx4
 ^rtos/source/TARGET_CORTEX/rtx5
 ^targets

.travis.yml

@@ -100,7 +100,8 @@ matrix:
         - |
           ! git grep '^#include\s["'"']mbed.h['"'"]$' -- '*.c' '*.h' '*.cpp' '*.hpp' \
               ':!*platform_mbed.h' ':!*TESTS/*' ':!TEST_APPS/' ':!UNITTESTS/' \
-              ':!*tests/*' ':!*targets/*' ':!*TARGET_*' ':!*unsupported/*'
+              ':!*tests/*' ':!*targets/*' ':!*TARGET_*' ':!*unsupported/*' \
+              ':!*events/tests/*'
 
 
     ### Docs Tests ###
@@ -252,10 +253,8 @@ matrix:
             connectivity/libraries/ppp connectivity/netsocket features/nanostack features/lwipstack features/frameworks/greentea-client \
             features/frameworks/utest features/frameworks/unity components BUILD
         - python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0
-        # Run local equeue tests
-        - make -C ${EVENTS}/source test
         # Run profiling tests
-        - make -C ${EVENTS}/source prof | tee prof
+        - make -C ${EVENTS}/tests/unit prof | tee prof
       after_success:
         # Update status, comparing with master if possible.
         - |

TESTS/mbed_hal/common_tickers_freq/main.cpp

@@ -29,10 +29,14 @@
 #include "hal/lp_ticker_api.h"
 #include "hal/mbed_lp_ticker_wrapper.h"
 
-#if defined(SKIP_TIME_DRIFT_TESTS) || !DEVICE_USTICKER
-#error [NOT_SUPPORTED] test not supported
+#if !DEVICE_USTICKER
+#error [NOT_SUPPORTED] UsTicker need to be enabled for this test
 #else
 
+#if defined(SKIP_TIME_DRIFT_TESTS)
+#error [NOT_SUPPORTED] timing accuracy tests skipped
+#endif // defined(SKIP_TIME_DRIFT_TESTS)
+
 #define US_PER_S 1000000
 
 using namespace utest::v1;
@@ -208,4 +212,4 @@ int main()
     Harness::run(specification);
 }
 
-#endif // defined(SKIP_TIME_DRIFT_TESTS) || !DEVICE_USTICKER
+#endif // !DEVICE_USTICKER

TESTS/usb_device/basic/USBEndpointTester.cpp

@@ -20,7 +20,7 @@
 #include "stdint.h"
 #include "stdlib.h"
 #include "USBEndpointTester.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "EndpointResolver.h"
 
 #define DEFAULT_CONFIGURATION       (1)

TESTS/usb_device/basic/USBEndpointTester.h

@@ -21,7 +21,7 @@
 /* These headers are included for child class. */
 #include "USBDescriptor.h"
 #include "USBDevice_Types.h"
-#include "EventQueue.h"
+#include "events/EventQueue.h"
 #include "EventFlags.h"
 #include "platform/NonCopyable.h"
 

TESTS/usb_device/basic/USBTester.cpp

@@ -19,7 +19,7 @@
 
 #include "stdint.h"
 #include "USBTester.h"
-#include "mbed_shared_queues.h"
+#include "events/mbed_shared_queues.h"
 #include "EndpointResolver.h"
 
 #define DEFAULT_CONFIGURATION (1)

TESTS/usb_device/basic/USBTester.h

@@ -21,7 +21,7 @@
 /* These headers are included for child class. */
 #include "USBDescriptor.h"
 #include "USBDevice_Types.h"
-#include "EventQueue.h"
+#include "events/EventQueue.h"
 #include "EventFlags.h"
 #include "platform/NonCopyable.h"
 

UNITTESTS/CMakeLists.txt

@@ -103,8 +103,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNITTEST")
 # Set include dirs.
 set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/target_h"
-  "${PROJECT_SOURCE_DIR}/target_h/events"
-  "${PROJECT_SOURCE_DIR}/target_h/events/equeue"
+  "${PROJECT_SOURCE_DIR}/../events/tests/UNITTESTS/target_h"
+  "${PROJECT_SOURCE_DIR}/../events/tests/UNITTESTS/target_h/equeue"
   "${PROJECT_SOURCE_DIR}/target_h/platform"
   "${PROJECT_SOURCE_DIR}/target_h/platform/cxxsupport"
   "${PROJECT_SOURCE_DIR}/target_h/drivers"
@@ -123,9 +123,9 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../storage/kvstore/kv_config/include"
   "${PROJECT_SOURCE_DIR}/../drivers"
   "${PROJECT_SOURCE_DIR}/../hal"
-  "${PROJECT_SOURCE_DIR}/../events"
+  "${PROJECT_SOURCE_DIR}/../events/include"
+  "${PROJECT_SOURCE_DIR}/../events/include/events/internal"
   "${PROJECT_SOURCE_DIR}/../events/source"
-  "${PROJECT_SOURCE_DIR}/../events/internal"
   "${PROJECT_SOURCE_DIR}/../rtos/include"
   "${PROJECT_SOURCE_DIR}/../features/frameworks"
   "${PROJECT_SOURCE_DIR}/../features/frameworks/mbed-trace"

UNITTESTS/events/equeue/unittest.cmake

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "equeue.h"
+#include "events/equeue.h"
 #include <stdlib.h>
 
 #include "equeue_stub.h"