Merge pull request #9370 from ARMmbed/release-candidate

Release candidate for mbed-os-5.11.2

Author: Cruz Monrreal

.travis.yml

@@ -46,6 +46,8 @@ before_install:
   # Setup ppa to make sure arm-none-eabi-gcc is correct version
   - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
   - sudo add-apt-repository -y ppa:deadsnakes/ppa
+  # workaround for https://travis-ci.community/t/then-sudo-apt-get-update-failed-public-key-is-not-available-no-pubkey-6b05f25d762e3157-in-ubuntu-xenial/1728
+  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157
   # Loop until update succeeds (timeouts can occur)
   - travis_retry $(! sudo apt-get update 2>&1 |grep Failed)
 
@@ -105,7 +107,7 @@ matrix:
         # Install dependencies
         - sudo apt-get install gcc-arm-embedded
         - pip install -r requirements.txt
-        - pip install pytest pylint hypothesis mock coverage coveralls
+        - pip install pytest pylint hypothesis==3.88.3 mock coverage coveralls
         # Print versions we use
 
         - arm-none-eabi-gcc --version
@@ -134,43 +136,25 @@ matrix:
     - env:
         - NAME=astyle
       install:
-      - curl -L0 https://mbed-os.s3-eu-west-1.amazonaws.com/builds/deps/astyle_3.1_linux.tar.gz --output astyle.tar.gz;
-        mkdir -p BUILD && tar xf astyle.tar.gz -C BUILD;
-        pushd BUILD/astyle/build/gcc;
-        make;
-        export PATH=$PWD/bin:$PATH;
-        popd;
-      - astyle --version
+        - >-
+          curl -L0 https://mbed-os.s3-eu-west-1.amazonaws.com/builds/deps/astyle_3.1_linux.tar.gz --output astyle.tar.gz;
+          mkdir -p BUILD && tar xf astyle.tar.gz -C BUILD;
+          cd BUILD/astyle/build/gcc;
+          make;
+          export PATH=$PWD/bin:$PATH;
+          cd -
+        - astyle --version
+        # Fetch remaining information needed for branch comparison
+        - git fetch --all --unshallow --tags
+        - git fetch origin "${TRAVIS_BRANCH}"
       script:
-        # only changed files this time
-        git diff --name-only --diff-filter=d $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 "";
-            echo "AStyle check failed, please fix style issues as shown above";
-            (exit 1);
-          else
-            echo "Coding style check OK";
-          fi
-      after_success:
-        # run astyle for all files on the branch
-        - git checkout -- .
-        - find -regex '.*\.\(h\|c\|hpp\|cpp\)$' -type f | fgrep -v -f .astyleignore | xargs -n 100 -I {} bash -c "astyle -n --options=.astylerc \"{}\"" > astyle-branch.out;
-        # update status if we succeeded, compare with master if possible
-        - |
-          CURR=$(cat astyle-branch.out | grep Formatted | wc -l)
-          PREV=$(curl -u "$MBED_BOT" https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
-              | jq -re "select(.sha != \"$TRAVIS_COMMIT\")
-                  | .statuses[] | select(.context == \"travis-ci/$NAME\").description
-                  | capture(\", (?<files>[0-9]+) files\").files" \
-              || echo 0)
+        - >-
+          git diff --name-only --diff-filter=d FETCH_HEAD..HEAD \
+            | ( grep '.\(c\|cpp\|h\|hpp\)$' || true ) \
+            | ( fgrep -v -f .astyleignore || true ) \
+            | while read file; do astyle -n --options=.astylerc "${file}"; done
+        - git diff --exit-code --diff-filter=d --color
 
-          STATUSM="Passed, ${CURR} files"
-          if [ "$PREV" -ne 0 ]
-          then
-              STATUSM="$STATUSM ($(python -c "print '%+d' % ($CURR-$PREV)") files)"
-          fi
-        - bash -c "$STATUS" success "$STATUSM"
     - env:
         - NAME=events
         - EVENTS=events
@@ -294,6 +278,7 @@ matrix:
         - echo 'Checking that there is no GPL licence text in code'
         - ! git grep -q --ignore-case "gnu general public";
         - ! git grep -q --ignore-case "gnu library general public";
+
     - env:
         - NAME=psa-autogen
       script:

TESTS/host_tests/rtc_calc_auto.py

@@ -117,7 +117,7 @@ def _verify_timestamp(self, key, value, timestamp):
             self.send_kv("passed", str(response))
         else:
             self.send_kv("failed", 0)
-            print "expected = %d, result = %d" %  (expected_timestamp , actual_timestamp)
+            print("expected = %d, result = %d" %  (expected_timestamp , actual_timestamp))
 
         # calculate next date
         if (self.first):

TESTS/mbed_hal/qspi/main.cpp

@@ -77,7 +77,6 @@ template <  qspi_bus_width_t write_inst_width,
             unsigned int write_cmd,
             qspi_address_size_t write_addr_size,
             qspi_alt_size_t write_alt_size,
-            int write_frequency,
             uint32_t write_count,
             qspi_bus_width_t read_inst_width,
             qspi_bus_width_t read_addr_width,
@@ -87,7 +86,7 @@ template <  qspi_bus_width_t write_inst_width,
             int read_dummy_cycles,
             qspi_address_size_t read_addr_size,
             qspi_alt_size_t read_alt_size,
-            int read_frequency,
+            int frequency,
             uint32_t read_count,
             uint32_t test_count,
             uint32_t data_size,

TESTS/mbed_hal/qspi/qspi_test.h

@@ -84,7 +84,7 @@ __attribute__((naked)) void call_mem(uint32_t addr)
     // since exception will be generated for invalid memory access.
     // Other instructions are for calling do_nothing function according to AAPCS.
     __ASM(
-        "LDR     r1, [r0]\n"
+        "LDR     r3, [r0]\n"
         "BX      lr\n"
     );
 }
@@ -138,10 +138,10 @@ utest::v1::status_t fault_override_teardown(const Case *const source, const size
 }
 
 Case cases[] = {
-    Case("SPM - Access secure RAM",       fault_override_setup, secure_ram_fault_test, fault_override_teardown),
-    Case("SPM - Access secure Flash",     fault_override_setup, secure_flash_fault_test, fault_override_teardown),
     Case("SPM - Access non-secure RAM",   fault_override_setup, non_secure_ram_fault_test, fault_override_teardown),
     Case("SPM - Access non-secure Flash", fault_override_setup, non_secure_flash_fault_test, fault_override_teardown),
+    Case("SPM - Access secure RAM",       fault_override_setup, secure_ram_fault_test, fault_override_teardown),
+    Case("SPM - Access secure Flash",     fault_override_setup, secure_flash_fault_test, fault_override_teardown)
 };
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases)

TESTS/mbed_hal/spm/main.cpp

@@ -39,7 +39,12 @@ void TCPSOCKET_BIND_ADDRESS()
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
     SocketAddress sockAddr = SocketAddress(get_interface()->get_ip_address(), 80);
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(sockAddr));
+    nsapi_error_t bind_result = sock->bind(sockAddr);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/tcp/tcpsocket_bind_address.cpp

@@ -38,7 +38,12 @@ void TCPSOCKET_BIND_ADDRESS_INVALID()
         TEST_FAIL();
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, sock->bind("190.2.3.4", 1024));
+    nsapi_error_t bind_result = sock->bind("190.2.3.4", 1024);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp

@@ -38,7 +38,12 @@ void TCPSOCKET_BIND_ADDRESS_NULL()
         TEST_FAIL();
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(NULL, 1024));
+    nsapi_error_t bind_result = sock->bind(NULL, 1024);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp

@@ -38,7 +38,12 @@ void TCPSOCKET_BIND_ADDRESS_PORT()
         TEST_FAIL();
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(get_interface()->get_ip_address(), 80));
+    nsapi_error_t bind_result = sock->bind(get_interface()->get_ip_address(), 80);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp

@@ -38,7 +38,12 @@ void TCPSOCKET_BIND_PORT()
         TEST_FAIL();
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(1024));
+    nsapi_error_t bind_result = sock->bind(1024);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/tcp/tcpsocket_bind_port.cpp

@@ -38,7 +38,14 @@ void TCPSOCKET_BIND_PORT_FAIL()
         TEST_FAIL();
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(1024));
+    nsapi_error_t bind_result = sock->bind(1024);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+        delete sock;
+        return;
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result);
+    }
 
     TCPSocket *sock2 = new TCPSocket;
     if (!sock2) {

TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp

@@ -37,7 +37,12 @@ void TCPSOCKET_BIND_UNOPENED()
     if (!sock) {
         TEST_FAIL();
     }
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_SOCKET, sock->bind(1024));
+    nsapi_error_t bind_result = sock->bind(1024);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_SOCKET, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp

@@ -40,7 +40,12 @@ void TCPSOCKET_BIND_WRONG_TYPE()
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
     char addr_bytes[16] = {0xfe, 0x80, 0xff, 0x1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     SocketAddress sockAddr = SocketAddress(addr_bytes, NSAPI_IPv4, 80);
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, sock->bind(sockAddr));
+    nsapi_error_t bind_result = sock->bind(sockAddr);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp

@@ -39,7 +39,12 @@ void UDPSOCKET_BIND_ADDRESS()
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
     SocketAddress sockAddr = SocketAddress(get_interface()->get_ip_address(), 80);
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(sockAddr));
+    nsapi_error_t bind_result = sock->bind(sockAddr);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/udp/udpsocket_bind_address.cpp

@@ -38,7 +38,12 @@ void UDPSOCKET_BIND_ADDRESS_INVALID()
         TEST_FAIL();
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, sock->bind("190.2.3.4", 1024));
+    nsapi_error_t bind_result = sock->bind("190.2.3.4", 1024);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/udp/udpsocket_bind_address_invalid.cpp

@@ -38,7 +38,12 @@ void UDPSOCKET_BIND_ADDRESS_NULL()
         TEST_FAIL();
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(NULL, 1024));
+    nsapi_error_t bind_result = sock->bind(NULL, 1024);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/udp/udpsocket_bind_address_null.cpp

@@ -38,7 +38,12 @@ void UDPSOCKET_BIND_ADDRESS_PORT()
         TEST_FAIL();
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(get_interface()->get_ip_address(), 80));
+    nsapi_error_t bind_result = sock->bind(get_interface()->get_ip_address(), 80);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/udp/udpsocket_bind_address_port.cpp

@@ -38,7 +38,12 @@ void UDPSOCKET_BIND_PORT()
         TEST_FAIL();
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(1024));
+    nsapi_error_t bind_result = sock->bind(1024);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/udp/udpsocket_bind_port.cpp

@@ -38,7 +38,14 @@ void UDPSOCKET_BIND_PORT_FAIL()
         TEST_FAIL();
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->bind(1024));
+    nsapi_error_t bind_result = sock->bind(1024);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+        delete sock;
+        return;
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, bind_result);
+    }
 
     UDPSocket *sock2 = new UDPSocket;
     if (!sock2) {

TESTS/netsocket/udp/udpsocket_bind_port_fail.cpp

@@ -37,7 +37,12 @@ void UDPSOCKET_BIND_UNOPENED()
     if (!sock) {
         TEST_FAIL();
     }
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_SOCKET, sock->bind(1024));
+    nsapi_error_t bind_result = sock->bind(1024);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_SOCKET, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/udp/udpsocket_bind_unopened.cpp

@@ -40,7 +40,12 @@ void UDPSOCKET_BIND_WRONG_TYPE()
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
     char addr_bytes[16] = {0xfe, 0x80, 0xff, 0x1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     SocketAddress sockAddr = SocketAddress(addr_bytes, NSAPI_IPv4, 80);
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, sock->bind(sockAddr));
+    nsapi_error_t bind_result = sock->bind(sockAddr);
+    if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
+        TEST_IGNORE_MESSAGE("bind() not supported");
+    } else {
+        TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, bind_result);
+    }
 
     delete sock;
 

TESTS/netsocket/udp/udpsocket_bind_wrong_type.cpp

@@ -42,7 +42,7 @@ psa_its_status_t test_psa_its_reset_impl(void)
     }
 
     KVMap &kv_map = KVMap::get_instance();
-    KVStore *kvstore = kv_map.get_main_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
+    KVStore *kvstore = kv_map.get_internal_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
     if (!kvstore) {
         return PSA_ITS_ERROR_STORAGE_FAILURE;
     }

TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp

@@ -42,7 +42,7 @@ psa_its_status_t test_psa_its_reset_impl(void)
     }
 
     KVMap &kv_map = KVMap::get_instance();
-    KVStore *kvstore = kv_map.get_main_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
+    KVStore *kvstore = kv_map.get_internal_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
     if (!kvstore) {
         return PSA_ITS_ERROR_STORAGE_FAILURE;
     }

TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/test_pits_impl.cpp

@@ -42,7 +42,7 @@ psa_its_status_t test_psa_its_reset_impl(void)
     }
 
     KVMap &kv_map = KVMap::get_instance();
-    KVStore *kvstore = kv_map.get_main_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
+    KVStore *kvstore = kv_map.get_internal_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
     if (!kvstore) {
         return PSA_ITS_ERROR_STORAGE_FAILURE;
     }

TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp

@@ -42,7 +42,7 @@ psa_its_status_t test_psa_its_reset_impl(void)
     }
 
     KVMap &kv_map = KVMap::get_instance();
-    KVStore *kvstore = kv_map.get_main_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
+    KVStore *kvstore = kv_map.get_internal_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
     if (!kvstore) {
         return PSA_ITS_ERROR_STORAGE_FAILURE;
     }