Merge pull request #8763 from cmonr/rollup-b.1

Rollup PR: Retest CI-troubled PRs target for 5.11 v2

Author: 0xc0170

.astyleignore

@@ -16,6 +16,7 @@ hal/storage_abstraction
 TESTS/mbed_hal/trng/pithy
 features/nanostack/coap-service
 features/nanostack/sal-stack-nanostack
+features/nanostack/targets
 rtos/TARGET_CORTEX/rtx5
 TESTS/mbed_hal/trng/pithy
 targets

.travis.yml

@@ -132,7 +132,9 @@ matrix:
         - git diff --name-only $TRAVIS_BRANCH | grep '.*\.\(h\|c\|hpp\|cpp\)' | fgrep -v -f .astyleignore | xargs -n 100 -I {} bash -c "astyle -n --options=.astylerc \"{}\"" > astyle-files-changed.out;
           if [ $(cat astyle-files-changed.out | grep Formatted | wc -l) -ne 0 ]; then
             git --no-pager diff;
-            echo "Please fix style issues as shown above";
+            echo "";
+            echo "AStyle check failed, please fix style issues as shown above";
+            (exit 1);
           else
             echo "Coding style check OK";
           fi
@@ -155,7 +157,6 @@ matrix:
               STATUSM="$STATUSM ($(python -c "print '%+d' % ($CURR-$PREV)") files)"
           fi
         - bash -c "$STATUS" success "$STATUSM"
-
     - env:
         - NAME=events
         - EVENTS=events

TESTS/mbed_hal/critical_section/critical_section_test.h

@@ -16,9 +16,9 @@
 
 /** \addtogroup hal_critical
  *  @{
- *  \defgroup hal_critical_test Tests 
+ *  \defgroup hal_critical_test Tests
  *  Tests definitions of the HAL Critical module.
- *  @{ 
+ *  @{
  */
 
 #ifndef MBED_CRITICAL_SECTION_TEST_H

TESTS/mbed_hal/qspi/qspi_test.h

@@ -18,7 +18,7 @@
  *  @{
  *  \defgroup hal_qspi_tests Tests
  *  QSPI tests of the HAL.
- *  @{ 
+ *  @{
  */
 #ifndef MBED_QSPI_TEST_H
 #define MBED_QSPI_TEST_H

TESTS/mbed_hal/rtc_time/main.cpp

@@ -183,15 +183,15 @@ void test_set_time_twice()
     /* Set the time to NEW_TIME and check it */
     set_time(NEW_TIME);
     current_time = time(NULL);
-    TEST_ASSERT_EQUAL (true, (current_time == NEW_TIME));
+    TEST_ASSERT_EQUAL(true, (current_time == NEW_TIME));
 
     /* Wait 2 seconds */
     wait_ms(2000);
 
     /* set the time to NEW_TIME again and check it */
     set_time(NEW_TIME);
     current_time = time(NULL);
-    TEST_ASSERT_EQUAL (true, (current_time == NEW_TIME));
+    TEST_ASSERT_EQUAL(true, (current_time == NEW_TIME));
 }
 
 Case cases[] = {

TESTS/mbed_hal/sleep/sleep_test_utils.h

@@ -19,7 +19,7 @@
  * @{
  * @defgroup hal_sleep_test_util Tests
  * Tests of the sleep HAL.
- * @{     
+ * @{
  */
 
 #ifndef MBED_SLEEP_TEST_UTILS_H

UNITTESTS/features/lorawan/loramac/Test_LoRaMac.cpp

@@ -215,6 +215,10 @@ void exp_cb()
 TEST_F(Test_LoRaMac, set_device_class)
 {
     object->set_device_class(CLASS_B, exp_cb);
+
+    my_phy phy;
+    object->bind_phy(phy);
+    object->set_device_class(CLASS_C, exp_cb);
 }
 
 TEST_F(Test_LoRaMac, setup_link_check_request)

UNITTESTS/features/netsocket/InternetSocket/test_InternetSocket.cpp

@@ -26,7 +26,8 @@ class stubInternetSocket : public InternetSocket {
 protected:
     nsapi_error_t return_value;
 public:
-    stubInternetSocket() {
+    stubInternetSocket()
+    {
         return_value = 0;
     }
     virtual nsapi_error_t connect(const SocketAddress &address)

UNITTESTS/stubs/AT_CellularContext_stub.cpp

@@ -20,8 +20,8 @@
 using namespace mbed;
 
 AT_CellularContext::AT_CellularContext(ATHandler &at, CellularDevice *device, const char *apn) :
-        AT_CellularBase(at), _ip_stack_type_requested(DEFAULT_STACK), _is_connected(false), _is_blocking(true),
-        _current_op(OP_INVALID), _device(device), _nw(0), _fh(0)
+    AT_CellularBase(at), _ip_stack_type_requested(DEFAULT_STACK), _is_connected(false), _is_blocking(true),
+    _current_op(OP_INVALID), _device(device), _nw(0), _fh(0)
 {
     _stack = NULL;
     _ip_stack_type = DEFAULT_STACK;
@@ -115,7 +115,7 @@ void AT_CellularContext::set_sim_pin(const char *sim_pin)
 }
 
 nsapi_error_t AT_CellularContext::connect(const char *sim_pin, const char *apn, const char *uname,
-                              const char *pwd)
+                                          const char *pwd)
 {
     return NSAPI_ERROR_OK;
 }
@@ -173,7 +173,7 @@ bool AT_CellularContext::set_new_context(int cid)
 
 nsapi_error_t AT_CellularContext::do_activate_context()
 {
-   return NSAPI_ERROR_OK;
+    return NSAPI_ERROR_OK;
 }
 
 void AT_CellularContext::do_connect()

UNITTESTS/stubs/CellularDevice_stub.cpp

@@ -26,8 +26,8 @@ MBED_WEAK CellularDevice *CellularDevice::get_default_instance()
     return NULL;
 }
 
-CellularDevice::CellularDevice(FileHandle *fh) :  _network_ref_count(0), _sms_ref_count(0),_power_ref_count(0), _sim_ref_count(0),
-        _info_ref_count(0), _fh(fh), _queue(5 * EVENTS_EVENT_SIZE), _state_machine(0), _nw(0)
+CellularDevice::CellularDevice(FileHandle *fh) :  _network_ref_count(0), _sms_ref_count(0), _power_ref_count(0), _sim_ref_count(0),
+    _info_ref_count(0), _fh(fh), _queue(5 * EVENTS_EVENT_SIZE), _state_machine(0), _nw(0)
 {
 }
 
@@ -41,11 +41,11 @@ events::EventQueue *CellularDevice::get_queue()
     return NULL;
 }
 
-void CellularDevice::set_plmn(char const*)
+void CellularDevice::set_plmn(char const *)
 {
 }
 
-void CellularDevice::set_sim_pin(char const*)
+void CellularDevice::set_sim_pin(char const *)
 {
 }
 

UNITTESTS/stubs/CellularStateMachine_stub.cpp

@@ -23,7 +23,7 @@
 namespace mbed {
 
 CellularStateMachine::CellularStateMachine(CellularDevice &device, events::EventQueue &queue) :
-        _cellularDevice(device), _queue(queue)
+    _cellularDevice(device), _queue(queue)
 {
 
 }

UNITTESTS/stubs/FileHandle_stub.h

@@ -65,7 +65,7 @@ class FileHandle_stub : public FileHandle {
         return 0;
     }
 
-    virtual int close() 
+    virtual int close()
     {
     }
 

UNITTESTS/stubs/NetworkStack_stub.h

@@ -26,7 +26,8 @@ class NetworkStackstub : public NetworkStack {
     std::list<nsapi_error_t> return_values;
     nsapi_error_t return_value;
 
-    NetworkStackstub() {
+    NetworkStackstub()
+    {
         return_value = 0;
     }
 

components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h

@@ -36,7 +36,7 @@ class FlashIAPBlockDevice : public BlockDevice {
      */
     FlashIAPBlockDevice(uint32_t address = MBED_CONF_FLASHIAP_BLOCK_DEVICE_BASE_ADDRESS,
                         uint32_t size = MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE);
-                        
+
     virtual ~FlashIAPBlockDevice();
 
     /** Initialize a block device