TEST

.codecheckignore

@@ -7,6 +7,7 @@
 ^connectivity/drivers/emac
 ^connectivity/drivers/mbedtls
 ^connectivity/drivers/wifi/COMPONENT_WHD
+^connectivity/drivers/wifi/TARGET_STM/COMPONENT_EMW3080B/mx_wifi
 ^connectivity/mbedtls
 ^features/frameworks
 ^connectivity/lwipstack/lwip

.mergify.yml

@@ -47,32 +47,36 @@ pull_request_rules:
       - check-failure=cmake-checks
       - check-failure=frozen-tools-check 
       - "label!=mergify skip"
+      - "label!='needs: work'"
     actions:
       label:
         add: ['needs: work']
         remove: ['needs: review', 'needs: CI']
 
-  # From needs: review to needs: work - CI failure
+  # From needs: CI to needs: work - CI failure in jenkins pipeline
   - name: "label needs: work when Jenkins CI failed - pr head"
     conditions:
-      # Jenkins CI failing
+      # Jenkins CI failing, only pr head
       - check-failure~=continuous-integration/jenkins/pr-head
       - "label!=mergify skip"
+      - "label=needs: CI"
+      - -closed
     actions:
       label:
         add: ['needs: work']
-        remove: ['needs: review','needs: CI']
+        remove: ['needs: CI']
 
-  # From needs: review to needs: work - CI failure
+  # From needs: CI to needs: work - CI failure
   - name: "label needs: work when Jenkins CI failed - any of the pipeline"
     conditions:
       # Jenkins CI failing - any of the pipeline
       - check-failure~=^jenkins-ci
+      - "label=needs: CI"
       - "label!=mergify skip"
     actions:
       label:
         add: ['needs: work']
-        remove: ['needs: review', 'needs: CI']
+        remove: ['needs: CI']
 
   # From needs: review or needs: work to needs: CI. One approval means we should be good to start CI
   - name: "label needs: CI when at least one reviewers approval"

.travis.yml

@@ -0,0 +1,73 @@
+# Copyright (c) 2013-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
+#
+# 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.
+
+language: sh
+os: linux
+dist: focal
+
+
+env:
+  global:
+    - deps_url="https://mbed-os-ci-public.s3-eu-west-1.amazonaws.com/jenkins-ci/deps"
+    - deps_dir="${HOME}/.cache/deps"
+
+cache:
+  pip: true
+  ccache: true
+  directories:
+    - ${HOME}/.cache/deps
+
+before_install:
+  - source tools/test/travis-ci/functions.sh
+
+addons:
+  apt:
+    sources:
+      - sourceline: 'deb https://apt.kitware.com/ubuntu/ focal main'
+        key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
+    packages:
+      - cmake
+      - ninja-build
+      - gcovr
+      - libncursesw5
+      - g++-7
+
+matrix:
+  include:
+
+    ### Mbed OS unittest ###
+    - &cmake-build-run-unittest
+      stage: "CMake"
+      name: "CMake unittest build"
+      env: NAME=cmake_unittest
+      install:
+        # Hide Travis-preinstalled CMake
+        # The Travis-preinstalled CMake is unfortunately not installed via apt, so we
+        # can't replace it with an apt-supplied version very easily. Additionally, we
+        # can't permit the Travis-preinstalled copy to survive, as the Travis default
+        # path lists the Travis CMake install location ahead of any place where apt
+        # would install CMake to. Instead of apt removing or upgrading to a new CMake
+        # version, we must instead delete the Travis copy of CMake.
+        - sudo rm -rf /usr/local/cmake*
+      script:
+        - echo ctest --build-and-test . build --build-generator Ninja --build-options -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE=ON -DCMAKE_CXX_COMPILER=g++-7 -DCMAKE_C_COMPILER=gcc-7 --test-command ctest        
+        - ctest --build-and-test . build --build-generator Ninja --build-options -DBUILD_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE=ON -DCMAKE_CXX_COMPILER=g++-7 -DCMAKE_C_COMPILER=gcc-7 --test-command ctest        
+        - gcovr --gcov-executable gcov-7 -r . ./build -s -x coverage.xml -e ".*\.h" --exclude-directories=$TRAVIS_BUILD_DIR/build/UNITTESTS --exclude-directories=$TRAVIS_BUILD_DIR/build/_deps
+        - ccache -s
+        - curl -Os https://uploader.codecov.io/latest/linux/codecov
+        - chmod +x codecov
+        - ./codecov -F unittests -f "coverage.xml" -t 57166f89-22b3-4949-9488-ddd3c78123fb
+

CMakeLists.txt

@@ -195,7 +195,9 @@ endif()
 if ("${CMAKE_GENERATOR}" MATCHES "Ninja")
     # known issue ARMClang and Ninja with response files for windows
     # https://gitlab.kitware.com/cmake/cmake/-/issues/21093
-    if((CMAKE_HOST_SYSTEM_NAME MATCHES "Windows" AND NOT CMAKE_CXX_COMPILER_ID MATCHES "ARMClang"))
+    # This gets fixed in newer cmake version
+    # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6484
+    if((CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") AND ((${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.22.0") OR (NOT CMAKE_CXX_COMPILER_ID MATCHES "ARMClang")))
         set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1 CACHE INTERNAL "")
     endif()
 endif()

UNITTESTS/CMakeLists.txt

@@ -17,7 +17,7 @@ include(FetchContent)
 # Download and unpack googletest
 FetchContent_Declare(googletest
     GIT_REPOSITORY https://github.com/google/googletest.git
-    GIT_TAG master
+    GIT_TAG main
 )
 FetchContent_MakeAvailable(googletest)
 

codecov.yml

@@ -0,0 +1,38 @@
+codecov:
+  require_ci_to_pass: yes
+
+coverage:
+  precision: 2
+  round: down
+  range: "0...100"
+  status:
+    project:
+      default:
+        # basic
+        target: auto
+        threshold: 2%
+        base: auto
+        # advanced
+        branches:
+          - master
+        if_not_found: success
+        if_ci_failed: error
+        informational: true
+        only_pulls: false
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "reach,diff,flags,files,footer"
+  behavior: default
+  require_changes: no
+
+ignore:
+  - "**/tests/**"
+  - "**/test/**"

connectivity/CMakeLists.txt

@@ -24,7 +24,17 @@ add_library(mbed-nfc INTERFACE)
 add_library(mbed-ppp INTERFACE)
 add_library(mbed-wifi INTERFACE)
 
-if(${CMAKE_CROSSCOMPILING})
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+    # Add these subdirectories for tests
+    add_subdirectory(cellular)
+    add_subdirectory(drivers)
+    add_subdirectory(FEATURE_BLE)
+    add_subdirectory(libraries)
+    add_subdirectory(lorawan)
+    add_subdirectory(mbedtls)
+    add_subdirectory(netsocket)
+    add_subdirectory(nfc)
+else()
     # The directories below contain optional target libraries
     add_subdirectory(FEATURE_BLE EXCLUDE_FROM_ALL)
     add_subdirectory(cellular EXCLUDE_FROM_ALL)
@@ -36,12 +46,4 @@ if(${CMAKE_CROSSCOMPILING})
     add_subdirectory(nanostack EXCLUDE_FROM_ALL)
     add_subdirectory(netsocket EXCLUDE_FROM_ALL)
     add_subdirectory(nfc EXCLUDE_FROM_ALL)
-else()
-    # Add these subdirectories for the Unit test
-    add_subdirectory(cellular)
-    add_subdirectory(lorawan)
-    add_subdirectory(netsocket)
-    add_subdirectory(mbedtls)
-    add_subdirectory(libraries)
-    add_subdirectory(FEATURE_BLE)
 endif()

connectivity/FEATURE_BLE/CMakeLists.txt

@@ -2,7 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
-    add_subdirectory(tests/UNITTESTS)
+    if(NOT BUILD_GREENTEA_TESTS)
+        add_subdirectory(tests/UNITTESTS)
+    endif()
 endif()
 
 add_subdirectory(libraries)

connectivity/cellular/include/cellular/framework/AT/AT_CellularStack.h

@@ -88,21 +88,6 @@ class AT_CellularStack : public NetworkStack {
 
     virtual void socket_attach(nsapi_socket_t handle, void (*callback)(void *), void *data);
 
-
-    nsapi_size_or_error_t socket_sendto_control(nsapi_socket_t handle, const SocketAddress &address,
-                                                const void *data, nsapi_size_t size,
-                                                nsapi_msghdr_t *control, nsapi_size_t control_size) override
-    {
-        return NSAPI_ERROR_UNSUPPORTED;
-    }
-
-    nsapi_size_or_error_t socket_recvfrom_control(nsapi_socket_t handle, SocketAddress *address,
-                                                  void *data, nsapi_size_t size,
-                                                  nsapi_msghdr_t *control, nsapi_size_t control_size) override
-    {
-        return NSAPI_ERROR_UNSUPPORTED;
-    }
-
 protected:
     class CellularSocket {
     public:

connectivity/drivers/802.15.4_RF/atmel-rf-driver/CMakeLists.txt

@@ -1,5 +1,20 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
+#################################################################################
+## Copyright 2020-2021 Pelion.
+##
+## 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.
+#################################################################################
 
 target_include_directories(mbed-802.15.4-rf
     INTERFACE

connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAT86RF215.cpp

@@ -703,19 +703,20 @@ static void rf_handle_rx_done(void)
         rf_state = RF_IDLE;
     }
     if (rf_read_bbc_register(BBC_PC, rf_module) & FCSOK) {
-        if (!rf_read_rx_buffer(cur_rx_packet_len, rf_module)) {
+        uint16_t rx_packet_len = rf_read_rx_frame_length(rf_module);
+        if (!rf_read_rx_buffer(rx_packet_len, rf_module)) {
             uint8_t version = ((rx_buffer[1] & VERSION_FIELD_MASK) >> SHIFT_VERSION_FIELD);
             if (((rx_buffer[0] & MAC_FRAME_TYPE_MASK) == MAC_TYPE_ACK) && (version < MAC_FRAME_VERSION_2)) {
                 rf_handle_ack(rx_buffer[2], rx_buffer[0] & MAC_DATA_PENDING);
             } else {
                 int8_t rssi = (int8_t) rf_read_rf_register(RF_EDV, rf_module);
                 // Cut CRC bytes
                 if (mac_mode == IEEE_802_15_4_2011) {
-                    cur_rx_packet_len -= 2;
+                    rx_packet_len -= 2;
                 } else {
-                    cur_rx_packet_len -= 4;
+                    rx_packet_len -= 4;
                 }
-                device_driver.phy_rx_cb(rx_buffer, cur_rx_packet_len, 0xf0, rssi, rf_radio_driver_id);
+                device_driver.phy_rx_cb(rx_buffer, rx_packet_len, 0xf0, rssi, rf_radio_driver_id);
                 // If auto ack used, must wait until RF returns to RF_TXPREP state
                 if ((version != MAC_FRAME_VERSION_2) && (rx_buffer[0] & FC_AR)) {
                     wait_us(100);

connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/CMakeLists.txt

@@ -1,5 +1,20 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
+#################################################################################
+## Copyright 2020-2021 Pelion.
+##
+## 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.
+#################################################################################
 
 target_include_directories(mbed-802.15.4-rf
     INTERFACE

connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/CMakeLists.txt

@@ -1,5 +1,20 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
+#################################################################################
+## Copyright 2020-2021 Pelion.
+##
+## 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.
+#################################################################################
 
 target_include_directories(mbed-802.15.4-rf
     INTERFACE

connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp

@@ -514,7 +514,7 @@ class TransportDriver : public CordioHCITransportDriver {
                         }
                         break;
                     case INFO_STACK_TYPE_BLE_HCI:
-                        if (MBED_ROM_SIZE > 0xE0000)  {
+                        if (MBED_ROM_SIZE > (((p_wireless_info->VersionMajor > 1) || (p_wireless_info->VersionMinor >= 12)) ? 0xE1000 : 0xE0000))  {
                             error("Wrong MBED_ROM_SIZE with HCI FW\n");
                         }
                         break;

connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/stm32f7_eth_conf.c

@@ -17,6 +17,8 @@
 
 #include "stm32f7xx_hal.h"
 
+#if defined ETH
+
 void _eth_config_mac(ETH_HandleTypeDef *heth)
 {
     ETH_MACInitTypeDef macconf = {
@@ -59,3 +61,5 @@ void _eth_config_mac(ETH_HandleTypeDef *heth)
 
     (void) HAL_ETH_ConfigMAC(heth, &macconf);
 }
+
+#endif // defined ETH

connectivity/drivers/lora/COMPONENT_SX126X/mbed_lib.json

@@ -1,5 +1,6 @@
 {
     "name": "SX126X-lora-driver",
+    "requires": ["lora"],
     "config": {
         "spi-frequency": {
         	"help": "SPI frequency, Default: 16 MHz",

connectivity/drivers/lora/COMPONENT_SX1272/mbed_lib.json

@@ -1,5 +1,6 @@
 {
     "name": "sx1272-lora-driver",
+    "requires": ["lora"],
     "config": {
         "spi-frequency": {
         	"help": "SPI frequency, Default: 8 MHz",