From 70f060727be4a414c6b6393b97b63ec68bbadb0a Mon Sep 17 00:00:00 2001 From: Jakub Latusek Date: Mon, 22 Jan 2024 11:57:31 +0100 Subject: [PATCH] Update pw library wrapper name --- config/esp32/BUILD.gn | 2 +- config/openiotsdk/chip-gn/BUILD.gn | 2 +- src/test_driver/efr32/BUILD.gn | 2 +- src/test_driver/esp32/main/CMakeLists.txt | 2 +- src/test_driver/openiotsdk/unit-tests/CMakeLists.txt | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config/esp32/BUILD.gn b/config/esp32/BUILD.gn index cd5824d7b3fdcb..fe8c51af257713 100644 --- a/config/esp32/BUILD.gn +++ b/config/esp32/BUILD.gn @@ -38,7 +38,7 @@ group("esp32") { if (chip_build_tests) { deps += [ "${chip_root}/src:tests", - "${chip_root}/src/lib/support:testing_pw", + "${chip_root}/src/lib/support:pw_tests_wrapper", ] } } diff --git a/config/openiotsdk/chip-gn/BUILD.gn b/config/openiotsdk/chip-gn/BUILD.gn index 53f1d40e062db1..94e2f28635d114 100644 --- a/config/openiotsdk/chip-gn/BUILD.gn +++ b/config/openiotsdk/chip-gn/BUILD.gn @@ -21,7 +21,7 @@ group("openiotsdk") { if (chip_build_tests) { deps += [ "${chip_root}/src:tests", - "${chip_root}/src/lib/support:testing_pw", + "${chip_root}/src/lib/support:pw_tests_wrapper", ] } } diff --git a/src/test_driver/efr32/BUILD.gn b/src/test_driver/efr32/BUILD.gn index 710de080f6dd18..fc13219beaa50c 100644 --- a/src/test_driver/efr32/BUILD.gn +++ b/src/test_driver/efr32/BUILD.gn @@ -86,7 +86,7 @@ silabs_executable("efr32_device_tests") { "${chip_root}/src:tests", "${chip_root}/src/lib", "${chip_root}/src/lib/support:testing_nlunit", - "${chip_root}/src/lib/support:testing_pw", + "${chip_root}/src/lib/support:pw_tests_wrapper", "${examples_common_plat_dir}/pw_sys_io:pw_sys_io_silabs", "${nlunit_test_root}:nlunit-test", ] diff --git a/src/test_driver/esp32/main/CMakeLists.txt b/src/test_driver/esp32/main/CMakeLists.txt index 0ffa00590edc65..26cd4080e643d9 100644 --- a/src/test_driver/esp32/main/CMakeLists.txt +++ b/src/test_driver/esp32/main/CMakeLists.txt @@ -45,4 +45,4 @@ target_compile_options(${COMPONENT_LIB} PUBLIC ) target_link_directories(${COMPONENT_LIB} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/../chip/lib) -target_link_libraries(${COMPONENT_LIB} PUBLIC -lSupportTesting -lTestPW) +target_link_libraries(${COMPONENT_LIB} PUBLIC -lSupportTesting -lPWTestsWrapper) diff --git a/src/test_driver/openiotsdk/unit-tests/CMakeLists.txt b/src/test_driver/openiotsdk/unit-tests/CMakeLists.txt index 6dfd199081e194..10e55deb8ef06f 100644 --- a/src/test_driver/openiotsdk/unit-tests/CMakeLists.txt +++ b/src/test_driver/openiotsdk/unit-tests/CMakeLists.txt @@ -102,10 +102,9 @@ foreach(TEST_NAME IN LISTS TEST_NAMES_FROM_FILE) target_link_options(${APP_TARGET} PUBLIC -Wl,--whole-archive "${CMAKE_CURRENT_BINARY_DIR}/chip_build/lib/lib${TEST_NAME}.a" - "${CMAKE_CURRENT_BINARY_DIR}/chip_build/lib/libTestPW.a" + "${CMAKE_CURRENT_BINARY_DIR}/chip_build/lib/libPWTestsWrapper.a" -Wl,--no-whole-archive) -# ${MATTER_LIB_DIR}/libTestPW.a set_target_link(${APP_TARGET}) sdk_post_build(${APP_TARGET}) endforeach()