Skip to content

Commit 96dac48

Browse files
Fix baremetal build issues
1 parent 02ce417 commit 96dac48

File tree

19 files changed

+21
-21
lines changed

19 files changed

+21
-21
lines changed

.github/workflows/greentea_cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
# Note: We have to set a wifi network name and password so that the test will compile on devices that use wifi
147147
run: |
148148
rm -rf __build
149-
cmake -S . -B __build -GNinja -DUPLOAD_METHOD=NONE -DMBED_GREENTEA_WIFI_SECURE_SSID=SomeNetwork -DMBED_GREENTEA_WIFI_SECURE_PASSWORD=SomePassword -DCMAKE_CTEST_ARGUMENTS="--output-on-failure;-V" -DMBED_BUILD_GREENTEA_TESTS=ON -DMBED_GREENTEA_TEST_BAREMETAL=ON -DMBED_GREENTEA_SERIAL_PORT=/dev/ttyDUMMY -DMBED_TARGET=${{ matrix.target }} -DMBED_APP_JSON_PATH=TESTS/configs/greentea_baremetal.json5
149+
cmake -S . -B __build -GNinja -DUPLOAD_METHOD=NONE -DMBED_GREENTEA_WIFI_SECURE_SSID=SomeNetwork -DMBED_GREENTEA_WIFI_SECURE_PASSWORD=SomePassword -DCMAKE_CTEST_ARGUMENTS="--output-on-failure;-V" -DMBED_BUILD_GREENTEA_TESTS=ON -DMBED_GREENTEA_SERIAL_PORT=/dev/ttyDUMMY -DMBED_TARGET=${{ matrix.target }} -DMBED_APP_JSON_PATH=TESTS/configs/greentea_baremetal.json5
150150
cmake --build __build
151151
152152
- name: Build ${{ matrix.target }} with full profile

connectivity/netsocket/tests/TESTS/common/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ if("MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=WIFI" IN_LIST MBED_CONFIG_DE
2222
endif()
2323

2424
# Tests can link one of the below two libraries to use lwipstack or nanostack
25-
add_library(mbed-netsocket-tests-use-lwipstack STATIC greentea_network_stack_lwipstack.cpp)
25+
add_library(mbed-netsocket-tests-use-lwipstack STATIC EXCLUDE_FROM_ALL greentea_network_stack_lwipstack.cpp)
2626
target_link_libraries(mbed-netsocket-tests-use-lwipstack PUBLIC mbed-lwipstack)
2727

28-
add_library(mbed-netsocket-tests-use-nanostack STATIC greentea_network_stack_nanostack.cpp)
28+
add_library(mbed-netsocket-tests-use-nanostack STATIC EXCLUDE_FROM_ALL greentea_network_stack_nanostack.cpp)
2929
target_link_libraries(mbed-netsocket-tests-use-nanostack PUBLIC mbed-nanostack)

connectivity/netsocket/tests/TESTS/netsocket/dns/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ list(
2323
asynchronous_dns_cache.cpp
2424
)
2525

26-
if(MBED_GREENTEA_TEST_BAREMETAL)
26+
if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
2727
set(TEST_SKIPPED "This test requires an RTOS!")
2828
endif()
2929

connectivity/netsocket/tests/TESTS/netsocket/tcp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ list(
2727
tcpsocket_recv_100k.cpp
2828
)
2929

30-
if(MBED_GREENTEA_TEST_BAREMETAL)
30+
if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
3131
set(TEST_SKIPPED "This test requires an RTOS!")
3232
endif()
3333

connectivity/netsocket/tests/TESTS/netsocket/tls/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ list(
2323
tlssocket_cert_in_filesystem.cpp
2424
)
2525

26-
if(MBED_GREENTEA_TEST_BAREMETAL)
26+
if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
2727
set(TEST_SKIPPED "This test requires an RTOS!")
2828
endif()
2929

connectivity/netsocket/tests/TESTS/netsocket/udp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ list(APPEND
2323
udpsocket_echotest_burst.cpp
2424
)
2525

26-
if(MBED_GREENTEA_TEST_BAREMETAL)
26+
if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
2727
set(TEST_SKIPPED "This test requires an RTOS!")
2828
endif()
2929

connectivity/netsocket/tests/TESTS/network/interface/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ list(
99
networkinterface_status.cpp
1010
)
1111

12-
if(MBED_GREENTEA_TEST_BAREMETAL)
12+
if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
1313
set(TEST_SKIPPED "This test requires an RTOS!")
1414
endif()
1515

drivers/tests/TESTS/mbed_drivers/lp_timeout/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ if(NOT "DEVICE_LPTICKER=1" IN_LIST MBED_TARGET_DEFINITIONS)
55
set(TEST_SKIPPED "Low power ticker not supported for this target")
66
endif()
77

8-
if(MBED_GREENTEA_TEST_BAREMETAL)
9-
set(TEST_SKIPPED "Low power timer not supported for this target")
8+
if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
9+
set(TEST_SKIPPED "Test not supported on baremetal")
1010
endif()
1111

1212
mbed_greentea_add_test(

drivers/tests/TESTS/mbed_drivers/race_test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
if(${MBED_C_LIB} STREQUAL "small" OR MBED_GREENTEA_TEST_BAREMETAL)
4+
if(${MBED_C_LIB} STREQUAL "small" OR APPLICATION_PROFILE_CONFIG_BAREMETAL)
55
set(TEST_SKIPPED "Mutex test cases require RTOS with multithread to run")
66
endif()
77

drivers/usb/tests/TESTS/usb_device/msd/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if(NOT "DEVICE_USBDEVICE=1" IN_LIST MBED_TARGET_DEFINITIONS)
55
set(TEST_SKIPPED "USB Device is not supported for this target")
66
endif()
77

8-
if(MBED_GREENTEA_TEST_BAREMETAL)
8+
if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
99
set(TEST_SKIPPED "USB MSD test is not compatible with mbed-baremetal")
1010
endif()
1111

0 commit comments

Comments
 (0)