Merge pull request #8163 from ARMmbed/release-candidate

adbridge · web-flow · commit 610e35ddc6d5 · 2018-09-18T10:34:35.000+01:00
Release candidate for mbed-os-5.10.0-rc3
diff --git a/TESTS/netsocket/dns/main.cpp b/TESTS/netsocket/dns/main.cpp
@@ -178,7 +178,9 @@ Case cases[] = {
 #endif
     Case("SYNCHRONOUS_DNS", SYNCHRONOUS_DNS),
     Case("SYNCHRONOUS_DNS_MULTIPLE", SYNCHRONOUS_DNS_MULTIPLE),
+#ifdef MBED_EXTENDED_TESTS
     Case("SYNCHRONOUS_DNS_CACHE", SYNCHRONOUS_DNS_CACHE),
+#endif
     Case("SYNCHRONOUS_DNS_INVALID", SYNCHRONOUS_DNS_INVALID),
 };
 
diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
@@ -100,6 +100,7 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../rtos/TARGET_CORTEX"
   "${PROJECT_SOURCE_DIR}/../rtos/TARGET_CORTEX/rtx5/Include"
   "${PROJECT_SOURCE_DIR}/../cmsis"
+  "${PROJECT_SOURCE_DIR}/../features/frameworks/nanostack-libservice/mbed-client-libservice/"
 )
 
 # Create a list for test suites.
diff --git a/UNITTESTS/README.md b/UNITTESTS/README.md
@@ -45,7 +45,7 @@ sudo easy_install pip
 
 ### Installing covr
 
-Install gcovr code coverage tool globally with `pip install 'gcovr>=4.1'` or using virtualenv:
+Install gcovr code coverage tool globally with `pip install "gcovr>=4.1"` or using virtualenv:
 
 #### virtualenv
 
@@ -79,7 +79,7 @@ mbed test --unittests
 
 A subset of tests can be run by providing `-r` flag for the tool which runs tests matching a regular expression.
 
-e.g. `mbed test --unittests --run -r features_netsocket`
+e.g. `mbed test --unittests --run -r features-netsocket`
 
 ### Build manually without Python tools
 
@@ -105,7 +105,7 @@ mingw32-make
 
 #### Custom CMake variables
 
-Usage: 
+Usage:
 `cmake [RELATIVE PATH TO UNITTESTS DIR] [OPTIONS]`
 
 Keyword variables (usage `cmake -D<VARIABLE>(:<TYPE>)=<value>`:
@@ -157,17 +157,17 @@ mkdir UNITTESTS/build
 cd UNITTESTS/build
 cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE:STRING=html  ..
 make
-./features_netsocket_InternetSocket
-gcovr -r ../.. --html --html-detail -o ./index.html ./CMakeFiles/features_netsocket_InternetSocket.MbedOS.dir/
+./features-netsocket-InternetSocket
+gcovr -r ../.. --html --html-detail -o ./index.html ./CMakeFiles/features-netsocket-InternetSocket.MbedOS.dir/
 ```
 Windows:
 ```
 mkdir UNITTESTS/build
 cd UNITTESTS/build
 cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE:STRING=html -g "MinGW Makefiles" ..
 mingw32-make
-features_netsocket_InternetSocket.exe
-gcovr -r ..\.. --html --html-detail -o .\index.html .\CMakeFiles\features_netsocket_InternetSocket.MbedOS.dir\
+features-netsocket-InternetSocket.exe
+gcovr -r ..\.. --html --html-detail -o .\index.html .\CMakeFiles\features-netsocket-InternetSocket.MbedOS.dir\
 ```
 
 ## The structure of unit tests
@@ -203,7 +203,7 @@ Each class to be tested requires two files for unit testing:
 
 A unit test definition file `unittest.cmake` requires variables to be set for a test to be configured. File source paths in `unittest.cmake` files need to be relative to the unit test folder and `CMakeLists.txt`.
 
-* **TEST_SUITE_NAME** - Identifier for the test suite. Use naming convention *PATH_TO_THE_TESTABLE_FILE* e.g. *features_netsocket_InternetSocket*
+* **TEST_SUITE_NAME** - Identifier for the test suite. Use naming convention *PATH_TO_THE_TESTABLE_FILE* e.g. *features-netsocket-InternetSocket*
 * **unittest-includes** - Include paths for headers needed to build the tests in addition to the base include paths listed in [CMakeLists.txt](CMakeLists.txt). Optional.
 * **unittest-sources** - Mbed OS source files and stubs included for the build.
 * **unittest-test-sources** - Unit test source files.
@@ -225,7 +225,7 @@ For example to create a unit test for `rtos/Semaphore.cpp`:
 1. Create a directory for unit test files in `UNITTESTS/rtos/Semaphore`.
 2. Create a test definition file `UNITTESTS/rtos/Semaphore/unittest.cmake` with the following content:
 ```
-set(TEST_SUITE_NAME "rtos_Semaphore")
+set(TEST_SUITE_NAME "rtos-Semaphore")
 
 set(unittest-sources
 	stubs/mbed_assert.c
@@ -291,4 +291,4 @@ TEST_F(TestSemaphore, constructor)
 
 **Problem:** virus protection identifies files generated by CMake as malicious and quarantines the files on Windows.
 
-* **Solution**: restore the false positive files from the quarantine.
+* **Solution**: restore the false positive files from the quarantine.
diff --git a/UNITTESTS/features/cellular/framework/AT/AT_CellularBase/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/AT_CellularBase/unittest.cmake
@@ -4,7 +4,7 @@
 ####################
 
 # Unit test suite name
-set(TEST_SUITE_NAME "cellular_framework_AT_AT_CellularBase")
+set(TEST_SUITE_NAME "cellular-framework-AT-AT_CellularBase")
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
diff --git a/UNITTESTS/features/cellular/framework/common/util/unittest.cmake b/UNITTESTS/features/cellular/framework/common/util/unittest.cmake
@@ -4,7 +4,7 @@
 ####################
 
 # Unit test suite name
-set(TEST_SUITE_NAME "cellular_framework_common_util")
+set(TEST_SUITE_NAME "cellular-framework-common-util")
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
diff --git a/UNITTESTS/features/netsocket/InternetSocket/unittest.cmake b/UNITTESTS/features/netsocket/InternetSocket/unittest.cmake
@@ -4,12 +4,14 @@
 ####################
 
 # Unit test suite name
-set(TEST_SUITE_NAME "features_netsocket_InternetSocket")
+set(TEST_SUITE_NAME "features-netsocket-InternetSocket")
 
 set(unittest-sources
   ../features/netsocket/SocketAddress.cpp
   ../features/netsocket/NetworkStack.cpp
   ../features/netsocket/InternetSocket.cpp
+  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
 )
 
 set(unittest-test-sources
diff --git a/UNITTESTS/features/netsocket/NetworkInterface/unittest.cmake b/UNITTESTS/features/netsocket/NetworkInterface/unittest.cmake
@@ -4,7 +4,7 @@
 ####################
 
 # Unit test suite name
-set(TEST_SUITE_NAME "features_netsocket_NetworkInterface")
+set(TEST_SUITE_NAME "features-netsocket-NetworkInterface")
 
 # Source files
 set(unittest-sources
diff --git a/UNITTESTS/features/netsocket/TCPSocket/unittest.cmake b/UNITTESTS/features/netsocket/TCPSocket/unittest.cmake
@@ -4,12 +4,14 @@
 ####################
 
 # Unit test suite name
-set(TEST_SUITE_NAME "features_netsocket_TCPSocket")
+set(TEST_SUITE_NAME "features-netsocket-TCPSocket")
 
 set(unittest-sources
   ../features/netsocket/SocketAddress.cpp
   ../features/netsocket/InternetSocket.cpp
   ../features/netsocket/TCPSocket.cpp
+  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
 )
 
 set(unittest-test-sources
diff --git a/UNITTESTS/features/netsocket/UDPSocket/unittest.cmake b/UNITTESTS/features/netsocket/UDPSocket/unittest.cmake
@@ -4,13 +4,15 @@
 ####################
 
 # Unit test suite name
-set(TEST_SUITE_NAME "features_netsocket_UDPSocket")
+set(TEST_SUITE_NAME "features-netsocket-UDPSocket")
 
 set(unittest-sources
   ../features/netsocket/SocketAddress.cpp
   ../features/netsocket/NetworkStack.cpp
   ../features/netsocket/InternetSocket.cpp
   ../features/netsocket/UDPSocket.cpp
+  ../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
+  ../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
 )
 
 set(unittest-test-sources
diff --git a/UNITTESTS/platform/CircularBuffer/unittest.cmake b/UNITTESTS/platform/CircularBuffer/unittest.cmake
@@ -4,7 +4,7 @@
 ####################
 
 # Unit test suite name
-set(TEST_SUITE_NAME "platform_CircularBuffer")
+set(TEST_SUITE_NAME "platform-CircularBuffer")
 
 set(unittest-sources
 )
diff --git a/UNITTESTS/unit_test/test.py b/UNITTESTS/unit_test/test.py
@@ -134,7 +134,7 @@ def _get_coverage_script(self, coverage_type, excludes):
                          "./coverage.xml"])
 
         for path in excludes:
-            args.extend(["-e", path])
+            args.extend(["-e", path.replace("\\", "/")])
 
         if logging.getLogger().getEffectiveLevel() == logging.DEBUG:
             args.append("-v")
diff --git a/doxyfile_options b/doxyfile_options
@@ -843,7 +843,8 @@ EXCLUDE_PATTERNS       = */tools/* \
                          */cmsis/* \
                          */features/cryptocell/* \
                          */features/mbedtls/* \
-                         */features/storage/* \
+                         */features/storage/cfstore/* \
+                         */features/storage/FEATURE_STORAGE/* \
                          */features/unsupported/* \
                          */features/lwipstack/* \
                          */features/nanostack/sal-stack-nanostack/* \
@@ -855,7 +856,8 @@ EXCLUDE_PATTERNS       = */tools/* \
                          */nanostack/sal-stack-nanostack-eventloop/* \
                          */ble/generic/* \
                          */ble/pal/* \
-                         */components/* \
+                         */components/802.15.4_RF/* \
+                         */components/wifi/* \
                          */UNITTESTS/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
diff --git a/doxygen_options.json b/doxygen_options.json
@@ -10,5 +10,5 @@
     "EXPAND_AS_DEFINED": "",
     "SKIP_FUNCTION_MACROS": "NO",
     "STRIP_CODE_COMMENTS": "NO",
-    "EXCLUDE_PATTERNS": "*/tools/* */targets/* */features/mbedtls/* */features/storage/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/lwipstack/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/* */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/* */components/* */features/nfc/stack/*"
+    "EXCLUDE_PATTERNS": "*/tools/* */targets/* */features/mbedtls/* */features/storage/cfstore/* */features/storage/FEATURE_STORAGE/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/lwipstack/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/* */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/* */components/802.15.4_RF/* */components/wifi/* */features/nfc/stack/*"
 }
diff --git a/features/netsocket/TCPServer.cpp b/features/netsocket/TCPServer.cpp
@@ -28,6 +28,7 @@ TCPServer::~TCPServer()
 
 nsapi_error_t TCPServer::accept(TCPSocket *connection, SocketAddress *address)
 {
+    _lock.lock();
     nsapi_error_t ret;
 
     while (true) {
diff --git a/platform/mbed_lib.json b/platform/mbed_lib.json
@@ -72,7 +72,7 @@
         },
         "error-decode-http-url-str": {
             "help": "HTTP URL string for ARM Mbed-OS Error Decode microsite",
-            "value": "\"\\nFor more info, visit: https:/\\/armmbed.github.io/mbedos-error/?error=0x%08X\""
+            "value": "\"\\nFor more info, visit: https://armmbed.github.io/mbedos-error/?error=0x%08X\""
         }
     },
     "target_overrides": {
diff --git a/requirements.txt b/requirements.txt
@@ -6,7 +6,7 @@ IntelHex>=1.3
 junit-xml
 pyYAML
 requests
-mbed-ls>=1.4.2,==1.*
+mbed-ls>=1.5.1,==1.*
 mbed-host-tests>=1.1.2
 mbed-greentea>=0.2.24
 beautifulsoup4>=4
@@ -17,4 +17,4 @@ future>=0.16.0
 six>=1.11.0
 git+https://github.com/armmbed/manifest-tool.git@v1.4.5
 mbed-cloud-sdk==2.0.0
-icetea>=1.0.1,<2
+icetea>=1.0.2,<2
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F411xE/device/TOOLCHAIN_IAR/stm32f411xe.icf b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F411xE/device/TOOLCHAIN_IAR/stm32f411xe.icf
@@ -18,9 +18,9 @@ define region ROM_region = mem:[from __region_ROM_start__ to __region_ROM_end__]
 define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__];
 
 /* Stack and Heap */
-/*Heap 1/4 of ram and stack 1/8*/
-define symbol __size_cstack__ = 0x4000;
-define symbol __size_heap__   = 0x8000;
+/*Heap 84kB and stack 1kB */
+define symbol __size_cstack__ = 0x400;
+define symbol __size_heap__   = 0x15000;
 define block CSTACK    with alignment = 8, size = __size_cstack__   { };
 define block HEAP      with alignment = 8, size = __size_heap__     { };
 define block STACKHEAP with fixed order { block HEAP, block CSTACK };
diff --git a/tools/device_management.py b/tools/device_management.py
@@ -80,28 +80,40 @@ def inner(options):
 
 def wrap_init(func):
     def inner(options):
-        accounts = AccountManagementAPI()
-        certs = CertificatesAPI()
+        if getattr(options, 'api_key', None):
+            api_key = options.api_key
+        else:
+            api_key = getenv("MBED_CLOUD_SDK_API_KEY")
+        if getattr(options, 'server_address', None):
+            host_addr = options.server_address
+        else:
+            host_addr = getenv("MBED_CLOUD_SDK_HOST",
+                               "https://api.us-east-1.mbedcloud.com/")
+        config = {
+            "api_key": api_key,
+            "host": host_addr,
+        }
+        accounts = AccountManagementAPI(config)
+        certs = CertificatesAPI(config)
         api_key = accounts.list_api_keys(filter={
-            'key': getenv("MBED_CLOUD_SDK_API_KEY")
+            'key': api_key
         }).next()
-        user = accounts.get_user(api_key.owner_id)
         certificates_owned = list(certs.list_certificates())
         dev_cert_info = None
         for certif in certificates_owned:
-            if certif.type == "developer" and (certif.owner_id == user.id or
+            if certif.type == "developer" and (certif.owner_id == api_key.owner_id or
                                                certif.owner_id == api_key.id):
                 dev_cert_info = certs.get_certificate(certif.id)
-                LOG.info("Found developer certificate onwed by %s named %s",
-                         user.full_name, dev_cert_info.name)
+                LOG.info("Found developer certificate named %s",
+                         dev_cert_info.name)
                 break
         else:
             LOG.warning(
                 "Could not find developer certificate for this account."
                 " Generting a new developer certificate."
             )
             dev_cert_info = CertificatesAPI().add_developer_certificate(
-                "mbed-cli-auto {}".format(user.full_name),
+                "mbed-cli-auto {}".format(api_key.name),
                 description="cetificate auto-generated by Mbed CLI"
             )
         LOG.info("Writing developer certificate %s into c file "
diff --git a/tools/run_icetea.py b/tools/run_icetea.py
@@ -34,7 +34,6 @@
 
 
 def find_build_from_build_data(build_data, id, target, toolchain):
-
     if 'builds' not in build_data:
         raise Exception("build data is in wrong format, does not include builds object")
 
@@ -86,7 +85,7 @@ def create_test_suite(target, tool, icetea_json_output, build_data, tests_by_nam
             test_case = {
                 'name': test['name'],
                 'config': {
-                    'requirements': test['requirements']
+                    'requirements': set_allowed_platform(test['requirements'], target)
                 }
             }
 
@@ -104,6 +103,17 @@ def create_test_suite(target, tool, icetea_json_output, build_data, tests_by_nam
     return test_suite
 
 
+def set_allowed_platform(requirements, target):
+    """
+    Allowed platform restrict icetea to run tests on specific board
+    This targets tests to the right board in case that user has multiple ones connected same time
+    """
+    if '*' not in requirements['duts'].keys():
+        requirements['duts']['*'] = dict()
+    requirements['duts']['*']['allowed_platforms'] = [target]
+    return requirements
+
+
 def get_applications(test):
     ret = list()
     for dut in test['requirements']['duts'].values():
diff --git a/tools/test/run_icetea/run_icetea_unit_test.py b/tools/test/run_icetea/run_icetea_unit_test.py
@@ -21,7 +21,7 @@
 sys.path.insert(0, ROOT)
 
 from tools.run_icetea import find_build_from_build_data, filter_test_by_build_data, filter_test_by_name, \
-    get_application_list
+    get_application_list, set_allowed_platform
 
 """
 Unit tests for run_icetea.py
@@ -32,7 +32,8 @@
         {
             "id": "TEST_APPS-DEVICE-SOCKET_APP",
             "target_name": "K64F",
-            "toolchain_name": "GCC_ARM"
+            "toolchain_name": "GCC_ARM",
+            "result": "OK"
         }
     ]
 }
@@ -142,3 +143,36 @@ def test_get_application_list_not_found():
 
 def test_get_application_list_none():
     assert 'TEST_APPS-device-socket_app' in get_application_list(icetea_json_output, None)
+
+
+def test_set_allowed_platform_simple():
+    ret = set_allowed_platform({"duts": {}}, "K66F")
+    assert ret['duts']['*']['allowed_platforms'] == ["K66F"]
+
+
+def test_set_allowed_platform_normal():
+    ret = set_allowed_platform({
+        "duts": {
+            "*": {
+                "count": 3,
+                "allowed_platforms": ["K64F"],
+                "application": {"bin": "hex.bin"}
+            },
+            1: {"application": {"bin": "my_hex.bin"}},
+            2: {"application": {"bin": "my_hex2.bin"}}
+        }
+    }, "K66F")
+    assert ret['duts']['*']['allowed_platforms'] == ["K66F"]
+
+
+def test_set_allowed_platform_no_changes():
+    temp = {
+        "duts": {
+            "*": {
+                "count": 3,
+                "allowed_platforms": ["K64F"],
+                "application": {"bin": "hex.bin"}
+            },
+        }
+    }
+    assert temp == set_allowed_platform(temp, "K64F")
diff --git a/tools/toolchains/iar.py b/tools/toolchains/iar.py

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ set(unittest-includes-base`
`100`	`100`	`"${PROJECT_SOURCE_DIR}/../rtos/TARGET_CORTEX"`
`101`	`101`	`"${PROJECT_SOURCE_DIR}/../rtos/TARGET_CORTEX/rtx5/Include"`
`102`	`102`	`"${PROJECT_SOURCE_DIR}/../cmsis"`
	`103`	`+ "${PROJECT_SOURCE_DIR}/../features/frameworks/nanostack-libservice/mbed-client-libservice/"`
`103`	`104`	`)`
`104`	`105`
`105`	`106`	`# Create a list for test suites.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`####################`
`5`	`5`
`6`	`6`	`# Unit test suite name`
`7`		`-set(TEST_SUITE_NAME "platform_CircularBuffer")`
	`7`	`+set(TEST_SUITE_NAME "platform-CircularBuffer")`
`8`	`8`
`9`	`9`	`set(unittest-sources`
`10`	`10`	`)`