Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CMake: greentea: Migrate the NFC EEPROM test to CTest #15095

Merged
merged 6 commits into from
Sep 28, 2021
Merged

CMake: greentea: Migrate the NFC EEPROM test to CTest #15095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d954841
memap.py: Allow .a extension for Arm Compiler-generated libraries
LDong-Arm Sep 14, 2021
c01d417
CMake: connectivity: Unify checks for unit and greentea tests
LDong-Arm Sep 13, 2021
db8852c
CMake: connectivity: Guard unit test directories
LDong-Arm Sep 16, 2021
ce1f054
CMake: connectivity: Add drivers subdirectory for tests
LDong-Arm Sep 13, 2021
cbec61a
targets: Declare DISCO_L475VG_IOT01A's built-in M24SR NFC
LDong-Arm Sep 20, 2021
58f8359
CMake: greentea: Migrate the NFC EEPROM test to CTest
LDong-Arm Sep 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions connectivity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand 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()
4 changes: 3 additions & 1 deletion connectivity/FEATURE_BLE/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion connectivity/libraries/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(mbed-coap)
Expand Down
4 changes: 3 additions & 1 deletion connectivity/mbedtls/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

target_include_directories(mbed-mbedtls
Expand Down
6 changes: 6 additions & 0 deletions connectivity/nfc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@

add_subdirectory(libraries)

if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
if(BUILD_GREENTEA_TESTS)
add_subdirectory(tests/TESTS)
endif()
endif()

target_include_directories(mbed-nfc
INTERFACE
.
Expand Down
4 changes: 4 additions & 0 deletions connectivity/nfc/tests/TESTS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

add_subdirectory(nfc/eeprom)
17 changes: 8 additions & 9 deletions connectivity/nfc/tests/TESTS/nfc/eeprom/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
include(mbed_greentea)

set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.. CACHE INTERNAL "")
set(TEST_TARGET mbed-connectivity-nfc-eeprom)

include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)

project(${TEST_TARGET})
if(NOT "MBED_CONF_NFCEEPROM=1" IN_LIST MBED_CONFIG_DEFINITIONS)
set(TEST_SKIPPED "NFC EEPROM required")
endif()

mbed_greentea_add_test(
TEST_NAME
${TEST_TARGET}
mbed-connectivity-nfc-eeprom
TEST_SOURCES
main.cpp
TEST_REQUIRED_LIBS
mbed-nfc
TEST_SKIPPED
${TEST_SKIPPED}
)
3 changes: 2 additions & 1 deletion targets/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3761,7 +3761,8 @@
],
"extra_labels_add": [
"CORDIO",
"MX25R6435F"
"MX25R6435F",
"M24SR"
],
"supported_form_factors": [
"ARDUINO_UNO"
Expand Down
2 changes: 1 addition & 1 deletion tools/memap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def parse_mapfile(self, file_desc):
class _ArmccParser(_Parser):
RE = re.compile(
r'^\s+0x(\w{8})\s+0x(\w{8})\s+(\w+)\s+(\w+)\s+(\d+)\s+[*]?.+\s+(.+)$')
RE_OBJECT = re.compile(r'(.+\.(l|ar))\((.+\.o(bj)?)\)')
RE_OBJECT = re.compile(r'(.+\.(l|a|ar))\((.+\.o(bj)?)\)')
OBJECT_EXTENSIONS = (".o", ".obj")

def parse_object_name(self, line):
Expand Down