From c30e48fca44b98eb8a1b34b2cbfe476dc8ca1139 Mon Sep 17 00:00:00 2001 From: Aaron Massey Date: Mon, 10 Oct 2022 17:42:36 -0600 Subject: test: Remove defunct support for zmake The CMakeLists in the test drivers tests maintained code to be backwards compatible with zmake. Since we haven't supported invoking tests in zmake for some time this is dead CMake code. Remove it. BRANCH=none BUG=none TEST=CQ Signed-off-by: Aaron Massey Change-Id: I556c443f176f3a64af4c33711f2def5006434956 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3942834 Reviewed-by: Keith Short --- zephyr/test/drivers/CMakeLists.txt | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/zephyr/test/drivers/CMakeLists.txt b/zephyr/test/drivers/CMakeLists.txt index 76f170573a..203c40b181 100644 --- a/zephyr/test/drivers/CMakeLists.txt +++ b/zephyr/test/drivers/CMakeLists.txt @@ -11,41 +11,6 @@ add_subdirectory(${PLATFORM_EC}/zephyr/test/test_utils test_utils) get_target_property(TEST_SOURCES app SOURCES) -# Support zmake for now -if("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers") - set(CONFIG_LINK_TEST_SUITE_DEFAULT TRUE) - set(CONFIG_LINK_TEST_SUITE_USB_MALFUNCTION_SINK TRUE) - add_compile_definitions(CONFIG_LINK_TEST_SUITE_DEFAULT=1) - add_compile_definitions(CONFIG_LINK_TEST_SUITE_USB_MALFUNCTION_SINK=1) -elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-ap_mux_control") - set(CONFIG_LINK_TEST_SUITE_AP_MUX_CONTROL TRUE) - add_compile_definitions(CONFIG_LINK_TEST_SUITE_AP_MUX_CONTROL=1) -elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-usb_retimer_fw_update") - set(CONFIG_LINK_TEST_SUITE_USB_RETIMER_FW_UPDATE TRUE) - add_compile_definitions(CONFIG_LINK_TEST_SUITE_USB_RETIMER_FW_UPDATE=1) -elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-chargesplash") - set(CONFIG_LINK_TEST_SUITE_CHARGESPLASH TRUE) - add_compile_definitions(CONFIG_LINK_TEST_SUITE_CHARGESPLASH=1) -elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-isl923x") - set(CONFIG_LINK_TEST_SUITE_ISL923X TRUE) - add_compile_definitions(CONFIG_LINK_TEST_SUITE_ISL923X=1) -elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-led_driver") - set(CONFIG_LINK_TEST_SUITE_LED_DRIVER TRUE) - add_compile_definitions(CONFIG_LINK_TEST_SUITE_LED_DRIVER=1) -elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-dps") - set(CONFIG_LINK_TEST_SUITE_USB_PD_DPS TRUE) - add_compile_definitions(CONFIG_LINK_TEST_SUITE_USB_PD_DPS=1) -elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-usbc_alt_mode") - set(CONFIG_LINK_TEST_SUITE_USBC_ALT_MODE TRUE) - add_compile_definitions(CONFIG_LINK_TEST_SUITE_USBC_ALT_MODE=1) -elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-usbc_svdm_dfp_only") - set(CONFIG_LINK_TEST_SUITE_USBC_SVDM_DFP_ONLY TRUE) - add_compile_definitions(CONFIG_LINK_TEST_SUITE_USBC_SVDM_DFP_ONLY=1) -elseif("${ZMAKE_PROJECT_NAME}" STREQUAL "test-drivers-usbc_tbt_mode") - set(CONFIG_LINK_TEST_SUITE_USBC_TBT_MODE TRUE) - add_compile_definitions(CONFIG_LINK_TEST_SUITE_USBC_TBT_MODE=1) -endif() - # Add linked suites here add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_DEFAULT default) add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_ANX7447 anx7447) -- cgit v1.2.1