From e121d20f09d002f6d5528b2466f9813c80b3837c Mon Sep 17 00:00:00 2001 From: Adrian Gielniewski Date: Thu, 20 Feb 2025 00:47:13 +0100 Subject: [PATCH] native-sim Signed-off-by: Adrian Gielniewski --- .github/workflows/examples-nrfconnect.yaml | 2 +- config/nrfconnect/chip-module/CMakeLists.txt | 4 ++-- config/nxp/chip-module/CMakeLists.txt | 4 ++-- config/zephyr/chip-module/CMakeLists.txt | 4 ++-- scripts/build/builders/nrf.py | 2 +- src/app/tests/AppTestContext.cpp | 2 +- src/test_driver/nrfconnect/CMakeLists.txt | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index 3c8ccebe3a..a77c12471f 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -96,7 +96,7 @@ jobs: run: | scripts/run_in_build_env.sh 'pip3 install -r scripts/setup/requirements.nrfconnect.txt' scripts/run_in_build_env.sh "./scripts/tools/nrfconnect/tests/test_generate_factory_data.py" - - name: Run unit tests for Zephyr native_posix_64 platform + - name: Run unit tests for Zephyr native_sim/posix/64 platform if: github.event_name == 'push' || steps.changed_paths.outputs.tests == 'true' || steps.changed_paths.outputs.nrfconnect == 'true' run: | scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target nrf-native-posix-64-tests build" diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt index d0f84bcd69..b91b01d5c7 100644 --- a/config/nrfconnect/chip-module/CMakeLists.txt +++ b/config/nrfconnect/chip-module/CMakeLists.txt @@ -194,9 +194,9 @@ if (CONFIG_CHIP_CRYPTO_PSA) matter_add_gn_arg_bool ("chip_crypto_psa_spake2p" CONFIG_PSA_WANT_ALG_SPAKE2P_MATTER) endif() -if (BOARD STREQUAL "native_posix") +if (BOARD STREQUAL "native_sim") matter_add_gn_arg_string("target_cpu" "x86") -elseif (BOARD STREQUAL "native_posix/native/64") +elseif (BOARD STREQUAL "native_sim/native/64") matter_add_gn_arg_string("target_cpu" "x64") endif() diff --git a/config/nxp/chip-module/CMakeLists.txt b/config/nxp/chip-module/CMakeLists.txt index 12514adcc7..58aa769e8f 100644 --- a/config/nxp/chip-module/CMakeLists.txt +++ b/config/nxp/chip-module/CMakeLists.txt @@ -130,9 +130,9 @@ else() endif() -# if (BOARD STREQUAL "native_posix") +# if (BOARD STREQUAL "native_sim") # matter_add_gn_arg_string("target_cpu" "x86") -# elseif (BOARD STREQUAL "native_posix/native/64") +# elseif (BOARD STREQUAL "native_sim/native/64") # matter_add_gn_arg_string("target_cpu" "x64") # endif() diff --git a/config/zephyr/chip-module/CMakeLists.txt b/config/zephyr/chip-module/CMakeLists.txt index 2bcf0de54f..4e94bdea6b 100644 --- a/config/zephyr/chip-module/CMakeLists.txt +++ b/config/zephyr/chip-module/CMakeLists.txt @@ -108,9 +108,9 @@ if(CONFIG_CHIP) matter_add_gn_arg_bool("chip_inet_config_enable_tcp_endpoint" FALSE) matter_add_gn_arg_bool("chip_enable_read_client" CONFIG_CHIP_ENABLE_READ_CLIENT) - if(BOARD STREQUAL "native_posix") + if(BOARD STREQUAL "native_sim") matter_add_gn_arg_string("target_cpu" "x86") - elseif(BOARD STREQUAL "native_posix/native/64") + elseif(BOARD STREQUAL "native_sim/native/64") matter_add_gn_arg_string("target_cpu" "x64") endif() diff --git a/scripts/build/builders/nrf.py b/scripts/build/builders/nrf.py index f7b8dfb157..e82203d39b 100644 --- a/scripts/build/builders/nrf.py +++ b/scripts/build/builders/nrf.py @@ -128,7 +128,7 @@ def GnArgName(self): elif self == NrfBoard.NRF5340DK: return 'nrf5340dk_nrf5340_cpuapp' elif self == NrfBoard.NATIVE_POSIX_64: - return 'native_posix/native/64' + return 'native_sim/native/64' else: raise Exception('Unknown board type: %r' % self) diff --git a/src/app/tests/AppTestContext.cpp b/src/app/tests/AppTestContext.cpp index ecf4aff9bf..ccd8877b96 100644 --- a/src/app/tests/AppTestContext.cpp +++ b/src/app/tests/AppTestContext.cpp @@ -52,7 +52,7 @@ void AppContext::TearDownTestSuite() // This can particularly be a problem when this unprocessed work involves reporting engine runs, // since those can take a while and cause later tests to not reach their queued work before // their timeouts hit. This is only an issue in setups where all unit tests are compiled into - // a single file (e.g. nRF CI (Zephyr native_posix)). + // a single file (e.g. nRF CI (Zephyr native_sim)). // // Work around this issue by doing a DrainAndServiceIO() here to attempt to flush out any queued-up work. // diff --git a/src/test_driver/nrfconnect/CMakeLists.txt b/src/test_driver/nrfconnect/CMakeLists.txt index 7e154ffc04..13c1bf9495 100644 --- a/src/test_driver/nrfconnect/CMakeLists.txt +++ b/src/test_driver/nrfconnect/CMakeLists.txt @@ -18,10 +18,10 @@ # @file # CMake project for building and running selected CHIP unit tests using # 'nrfconnect' platform integration layer in CHIP and Zephyr -# 'native_posix[/native/64]' platforms. Note that certain design decisions behind -# the native_posix platforms make them inapplicable for some unit tests, +# 'native_sim[/native/64]' platforms. Note that certain design decisions behind +# the native_sim platforms make them inapplicable for some unit tests, # hence only a subset of CHIP unit tests is listed in the project. -# See: https://docs.zephyrproject.org/1.12.0/boards/posix/native_posix/doc/board.html +# See: https://docs.zephyrproject.org/4.0.0/boards/native/native_sim/doc/index.html # for more details. #