Merge pull request #9805 from ARMmbed/release-candidate

Release candidate for mbed-os-5.11.5

Author: 0xc0170

.github/pull_request_template.md

@@ -1,15 +1,15 @@
 ### Description
 
-<!-- 
+<!--
     Required
-    Add here detailed changes summary, testing results, dependencies 
+    Add here detailed changes summary, testing results, dependencies
     Good example: https://os.mbed.com/docs/mbed-os/latest/contributing/workflow.html (Pull request template)
 -->
 
 
 ### Pull request type
 
-<!-- 
+<!--
     Required
     Please add only one X to one of the following types. Do not fill multiple types (split the pull request otherwise).
     Please note this is not a GitHub task list, indenting the boxes or changing the format to add a '.' or '*' in front
@@ -26,8 +26,15 @@
 
 ### Reviewers
 
-<!-- 
+<!--
     Optional
     Request additional reviewers with @username
 -->
 
+### Release Notes
+
+<!--
+    Optional
+    In case of breaking changes, functionality changes or refactors, please add release notes here. 
+    For more information, please see [the contributing guidelines](https://os.mbed.com/docs/mbed-os/latest/contributing   /workflow.html#pull-request-types).
+-->

LICENSE renamed to LICENSE-apache-2.0.txt

@@ -0,0 +1,22 @@
+Unless specifically indicated otherwise in a file, files are licensed under the Apache 2.0 license,
+as can be found in: LICENSE-apache-2.0.txt
+
+Folders containing files under different permissive license than Apache 2.0 are listed below. Each folder should contain its own README file with license specified for its files. The original license text is included in those source files.
+
+- [cmsis](./cmsis) - MIT, BSD-3-Clause
+- [components/802.15.4_RF/mcr20a-rf-driver](./components/802.15.4_RF/mcr20a-rf-driver) - BSD-3-Clause
+- [features/cryptocell/FEATURE_CRYPTOCELL310](./features/cryptocell/FEATURE_CRYPTOCELL310) - ARM Object Code and Header Files License
+- [features/FEATURE_BOOTLOADER](./features/FEATURE_BOOTLOADER) - PBL
+- [features/FEATURE_BLE/targets](./features/FEATURE_BLE/targets) - BSD-style, PBL, MIT-style
+- [features/lorawan](./features/lorawan) - Revised BSD
+- [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style
+- [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause
+- [features/storage](./features/storage) - BSD-style, MIT
+- [features/netsocket/emac-drivers](./features/netsocket/emac-drivers) - BSD-style
+- [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT
+- [features/unsupported](./features/unsupported) - MIT-style, BSD-style
+- [rtos](./rtos) - MIT
+- [drivers](./drivers) - MIT
+- [TESTS/mbed_hal/trng/pithy](./TESTS/mbed_hal/trng/pithy) - BSD-3-Clause
+- [tools/data/rpc](./tools/data/rpc) - MIT
+- [targets](./targets) - PBL, BSD-style, MIT-style, Zlib-style, Public-domain

LICENSE.md

@@ -29,9 +29,11 @@ The [release notes](https://os.mbed.com/releases) detail the current release. Yo
 
 ## License and contributions 
 
-The software is provided under [Apache-2.0 license](LICENSE). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more info. 
+The software is provided under the [Apache-2.0 license](LICENSE-apache-2.0.txt). Contributions to this project are accepted under the same license. Please see [contributing.md](CONTRIBUTING.md) for more information.
 
-This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html)
+This project contains code from other projects. The original license text is included in those source files. They must comply with our [license guide](https://os.mbed.com/docs/latest/reference/license.html).
+
+Folders containing files under different permissive license than Apache 2.0 are listed in the [LICENSE](LICENSE) file.
 
 ## Getting started for developers
 

README.md

@@ -29,6 +29,17 @@
 
 #include "mbed.h"
 
+// Debug available
+#ifndef FLASHIAP_DEBUG
+#define FLASHIAP_DEBUG      0
+#endif
+
+#if FLASHIAP_DEBUG
+#define DEBUG_PRINTF(...) printf(__VA_ARGS__)
+#else
+#define DEBUG_PRINTF(...)
+#endif
+
 using namespace utest::v1;
 
 
@@ -37,6 +48,21 @@ void flashiap_init_test()
     FlashIAP flash_device;
     uint32_t ret = flash_device.init();
     TEST_ASSERT_EQUAL_INT32(0, ret);
+
+    uint32_t flash_start = flash_device.get_flash_start();
+    uint32_t flash_size = flash_device.get_flash_size();
+    utest_printf("Flash address: 0x%08x, size: %d\n", flash_start, flash_size);
+    uint32_t address = flash_start;
+    int num = 0;
+    while (flash_size) {
+        uint32_t sector_size = flash_device.get_sector_size(address);
+        // Make sure all sectors sum up to the total flash size
+        TEST_ASSERT(flash_size >= sector_size);
+        DEBUG_PRINTF("\tsector %3d: address 0x%08x, size %8d\n", num++, address, sector_size);
+        flash_size -= sector_size;
+        address += sector_size;
+    }
+
     ret = flash_device.deinit();
     TEST_ASSERT_EQUAL_INT32(0, ret);
 }

TESTS/mbed_drivers/flashiap/main.cpp

@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2016-2019 ARM Limited. All rights reserved.
+*
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the License); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an AS IS BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 #include "mbed_toolchain.h"
 
 #include <stdio.h>

TESTS/mbedmicro-mbed/attributes/attributes.c

@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2016-2019 ARM Limited. All rights reserved.
+*
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the License); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an AS IS BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 #include "mbed_toolchain.h"
 
 int testWeak1()

TESTS/mbedmicro-mbed/attributes/weak.c

@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2015-2019 ARM Limited. All rights reserved.
+*
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the License); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an AS IS BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 #include "mbed_assert.h"
 #define THE_ANSWER 42
 

TESTS/mbedmicro-mbed/static_assert/test_c.c

@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2016-2019 ARM Limited. All rights reserved.
+*
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the License); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an AS IS BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 #include "mbed_assert.h"
 #define THE_ANSWER 42
 

TESTS/mbedmicro-mbed/static_assert/test_cpp.cpp

@@ -42,6 +42,7 @@ void ASYNCHRONOUS_DNS_CANCEL()
             count++;
         } else {
             // No memory to initiate DNS query, callback will not be called
+            printf("Error: No memory to initiate DNS query for %s\n", dns_test_hosts[i]);
             data[i].result = NSAPI_ERROR_NO_MEMORY;
             data[i].value_set = true;
         }

TESTS/netsocket/dns/asynchronous_dns_cancel.cpp

@@ -57,6 +57,15 @@ void drop_bad_packets(TCPSocket &sock, int orig_timeout)
     sock.set_timeout(orig_timeout);
 }
 
+nsapi_version_t get_ip_version()
+{
+    SocketAddress test;
+    if (!test.set_ip_address(NetworkInterface::get_default_instance()->get_ip_address())) {
+        return NSAPI_UNSPEC;
+    }
+    return test.get_ip_version();
+}
+
 static void _ifup()
 {
     NetworkInterface *net = NetworkInterface::get_default_instance();

TESTS/netsocket/tcp/main.cpp

@@ -20,6 +20,7 @@
 
 NetworkInterface *get_interface();
 void drop_bad_packets(TCPSocket &sock, int orig_timeout);
+nsapi_version_t get_ip_version();
 void fill_tx_buffer_ascii(char *buff, size_t len);
 nsapi_error_t tcpsocket_connect_to_echo_srv(TCPSocket &sock);
 nsapi_error_t tcpsocket_connect_to_discard_srv(TCPSocket &sock);

TESTS/netsocket/tcp/tcp_tests.h

@@ -39,7 +39,14 @@ void TCPSOCKET_BIND_ADDRESS_INVALID()
         return;
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
-    nsapi_error_t bind_result = sock->bind("190.2.3.4", 1024);
+    nsapi_error_t bind_result = NSAPI_ERROR_OK;
+    if (get_ip_version() == NSAPI_IPv4) {
+        bind_result = sock->bind("190.2.3.4", 1024);
+    } else if (get_ip_version() == NSAPI_IPv6) {
+        bind_result = sock->bind("fe80::ff01", 1024);
+    } else {
+        TEST_FAIL_MESSAGE("This stack is neither IPv4 nor IPv6");
+    }
     if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
         TEST_IGNORE_MESSAGE("bind() not supported");
     } else {

TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp

@@ -40,7 +40,14 @@ void TCPSOCKET_BIND_WRONG_TYPE()
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
     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);
+    SocketAddress sockAddr;
+    if (get_ip_version() == NSAPI_IPv4) {
+        sockAddr = SocketAddress(addr_bytes, NSAPI_IPv4, 80);
+    } else if (get_ip_version() == NSAPI_IPv6) {
+        sockAddr = SocketAddress(addr_bytes, NSAPI_IPv6, 80);
+    } else {
+        TEST_FAIL_MESSAGE("This stack is neither IPv4 nor IPv6");
+    }
     nsapi_error_t bind_result = sock->bind(sockAddr);
     if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
         TEST_IGNORE_MESSAGE("bind() not supported");

TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp

@@ -195,9 +195,12 @@ Case cases[] = {
     Case("TLSSOCKET_SEND_REPEAT", TLSSOCKET_SEND_REPEAT),
     Case("TLSSOCKET_SEND_TIMEOUT", TLSSOCKET_SEND_TIMEOUT),
     Case("TLSSOCKET_NO_CERT", TLSSOCKET_NO_CERT),
-#ifndef __IAR_SYSTEMS_ICC__
-    Case("TLSSOCKET_SIMULTANEOUS", TLSSOCKET_SIMULTANEOUS)
-#endif
+//    Temporarily removing this test, as TLS library consumes too much memory
+//    and we see frequent memory allocation failures on architectures with less
+//    RAM such as DISCO_L475VG_IOT1A and NUCLEO_F207ZG (both have 128 kB RAM)
+//    This test also fails for IAR, due to wrong heap configuration in the linker
+//    script - see https://github.com/ARMmbed/mbed-os/issues/8306
+//    Case("TLSSOCKET_SIMULTANEOUS", TLSSOCKET_SIMULTANEOUS)
 };
 
 Specification specification(greentea_setup, cases, greentea_teardown, greentea_continue_handlers);

TESTS/netsocket/tls/main.cpp

@@ -63,8 +63,8 @@ void TLSSOCKET_ECHOTEST()
     if (tlssocket_connect_to_echo_srv(*sock) != NSAPI_ERROR_OK) {
         printf("Error from tlssocket_connect_to_echo_srv\n");
         TEST_FAIL();
-        return;
         delete sock;
+        return;
     }
 
     int recvd;

TESTS/netsocket/tls/tlssocket_echotest.cpp

@@ -31,8 +31,8 @@ void TLSSOCKET_HANDSHAKE_INVALID()
     TLSSocket sock;
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(NetworkInterface::get_default_instance()));
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.set_root_ca_cert(tls_global::cert));
-    TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_CONNECTION,
-                      sock.connect("google.com", MBED_CONF_APP_ECHO_SERVER_DISCARD_PORT_TLS));
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_AUTH_FAILURE,
+                      sock.connect("google.com", 443)); // 443 is https port.
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
 

TESTS/netsocket/tls/tlssocket_handshake_invalid.cpp

@@ -33,10 +33,26 @@
 
 using namespace utest::v1;
 
+namespace {
+Timer tc_bucket; // Timer to limit a test cases run time
+}
+
 #if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
 mbed_stats_socket_t udp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
 #endif
 
+void drop_bad_packets(UDPSocket &sock, int orig_timeout)
+{
+    nsapi_error_t err;
+    sock.set_timeout(0);
+    while (true) {
+        err = sock.recv(NULL, 0);
+        if (err == NSAPI_ERROR_WOULD_BLOCK) {
+            break;
+        }
+    }
+    sock.set_timeout(orig_timeout);
+}
 static void _ifup()
 {
     NetworkInterface *net = NetworkInterface::get_default_instance();
@@ -51,17 +67,14 @@ static void _ifdown()
     printf("MBED: ifdown\n");
 }
 
-void drop_bad_packets(UDPSocket &sock, int orig_timeout)
+
+nsapi_version_t get_ip_version()
 {
-    nsapi_error_t err;
-    sock.set_timeout(0);
-    while (true) {
-        err = sock.recvfrom(NULL, 0, 0);
-        if (err == NSAPI_ERROR_WOULD_BLOCK) {
-            break;
-        }
+    SocketAddress test;
+    if (!test.set_ip_address(NetworkInterface::get_default_instance()->get_ip_address())) {
+        return NSAPI_UNSPEC;
     }
-    sock.set_timeout(orig_timeout);
+    return test.get_ip_version();
 }
 
 void fill_tx_buffer_ascii(char *buff, size_t len)
@@ -71,6 +84,11 @@ void fill_tx_buffer_ascii(char *buff, size_t len)
     }
 }
 
+int split2half_rmng_udp_test_time()
+{
+    return (udp_global::TESTS_TIMEOUT - tc_bucket.read()) / 2;
+}
+
 #if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
 int fetch_stats()
 {
@@ -81,20 +99,20 @@ int fetch_stats()
 // Test setup
 utest::v1::status_t greentea_setup(const size_t number_of_cases)
 {
-    GREENTEA_SETUP(480, "default_auto");
+    GREENTEA_SETUP(udp_global::TESTS_TIMEOUT, "default_auto");
     _ifup();
+    tc_bucket.start();
     return greentea_test_setup_handler(number_of_cases);
 }
 
 void greentea_teardown(const size_t passed, const size_t failed, const failure_t failure)
 {
+    tc_bucket.stop();
     _ifdown();
     return greentea_test_teardown_handler(passed, failed, failure);
 }
 
 Case cases[] = {
-    Case("UDPSOCKET_ECHOTEST", UDPSOCKET_ECHOTEST),
-    Case("UDPSOCKET_ECHOTEST_NONBLOCK", UDPSOCKET_ECHOTEST_NONBLOCK),
     Case("UDPSOCKET_OPEN_CLOSE_REPEAT", UDPSOCKET_OPEN_CLOSE_REPEAT),
     Case("UDPSOCKET_OPEN_LIMIT", UDPSOCKET_OPEN_LIMIT),
     Case("UDPSOCKET_RECV_TIMEOUT", UDPSOCKET_RECV_TIMEOUT),
@@ -110,10 +128,11 @@ Case cases[] = {
     Case("UDPSOCKET_BIND_WRONG_TYPE", UDPSOCKET_BIND_WRONG_TYPE),
     Case("UDPSOCKET_BIND_UNOPENED", UDPSOCKET_BIND_UNOPENED),
     Case("UDPSOCKET_SENDTO_INVALID", UDPSOCKET_SENDTO_INVALID),
-    Case("UDPSOCKET_ECHOTEST", UDPSOCKET_ECHOTEST),
-    Case("UDPSOCKET_ECHOTEST_BURST", UDPSOCKET_ECHOTEST_BURST),
+    Case("UDPSOCKET_ECHOTEST_NONBLOCK", UDPSOCKET_ECHOTEST_NONBLOCK),
     Case("UDPSOCKET_ECHOTEST_BURST_NONBLOCK", UDPSOCKET_ECHOTEST_BURST_NONBLOCK),
     Case("UDPSOCKET_SENDTO_REPEAT", UDPSOCKET_SENDTO_REPEAT),
+    Case("UDPSOCKET_ECHOTEST", UDPSOCKET_ECHOTEST),
+    Case("UDPSOCKET_ECHOTEST_BURST", UDPSOCKET_ECHOTEST_BURST),
 };
 
 Specification specification(greentea_setup, cases, greentea_teardown, greentea_continue_handlers);