diff options
author | Robert Zieba <robertzieba@google.com> | 2023-02-15 23:34:39 +0000 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-02-22 20:08:49 +0000 |
commit | 5d4166dd76bc692e6e91e00f452bca2e66e45fb4 (patch) | |
tree | b3ece6464d72f7cb5493f9b3eb498ca23da7badd | |
parent | 554dbe4f8ab9d4613adae9a659f6552ee671a1ef (diff) | |
download | chrome-ec-5d4166dd76bc692e6e91e00f452bca2e66e45fb4.tar.gz |
zephyr/test/skyrim: Refactor baseboard code
Move baseboard pd tests to match new code structure.
BRANCH=none
BUG=b:247151116
TEST=Ran tests
Change-Id: I180b2681db3b526966dd9e16020dfe77b998c488
Signed-off-by: Robert Zieba <robertzieba@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4263555
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
-rw-r--r-- | zephyr/test/skyrim/CMakeLists.txt | 2 | ||||
-rw-r--r-- | zephyr/test/skyrim/tests/baseboard/CMakeLists.txt | 5 | ||||
-rw-r--r-- | zephyr/test/skyrim/tests/baseboard/src/usb_pd_policy.c (renamed from zephyr/test/skyrim/src/baseboard/usb_pd_policy.c) | 0 |
3 files changed, 6 insertions, 1 deletions
diff --git a/zephyr/test/skyrim/CMakeLists.txt b/zephyr/test/skyrim/CMakeLists.txt index 8745c0804e..dcc15cd460 100644 --- a/zephyr/test/skyrim/CMakeLists.txt +++ b/zephyr/test/skyrim/CMakeLists.txt @@ -11,11 +11,11 @@ zephyr_include_directories("${PLATFORM_EC_PROGRAM_DIR}/skyrim/include") add_subdirectory(${PLATFORM_EC}/zephyr/test/test_utils test_utils) add_subdirectory(tests/common) +add_subdirectory_ifdef(CONFIG_TEST_BOARD_BASEBOARD tests/baseboard) target_sources(app PRIVATE src/${CONFIG_TEST_BOARD_NAME}/common.c) target_sources_ifdef(CONFIG_TEST_BOARD_ALT_CHARGER app PRIVATE src/${CONFIG_TEST_BOARD_ALT_CHARGER_SRC} ${PLATFORM_EC_PROGRAM_DIR}/skyrim/${CONFIG_TEST_BOARD_NAME}/src/alt_charger.c) target_sources_ifdef(CONFIG_TEST_BOARD_FAN app PRIVATE src/${CONFIG_TEST_BOARD_FAN_SRC} ${PLATFORM_EC_PROGRAM_DIR}/skyrim/${CONFIG_TEST_BOARD_NAME}/src/fan.c) target_sources_ifdef(CONFIG_TEST_BOARD_PPC_CONFIG app PRIVATE src/${CONFIG_TEST_BOARD_PPC_CONFIG_SRC} ${PLATFORM_EC_PROGRAM_DIR}/skyrim/${CONFIG_TEST_BOARD_NAME}/src/ppc_config.c) -target_sources_ifdef(CONFIG_TEST_BOARD_USB_PD_POLICY app PRIVATE src/baseboard/usb_pd_policy.c ${PLATFORM_EC_PROGRAM_DIR}/skyrim/src/usb_pd_policy.c) target_sources_ifdef(CONFIG_TEST_BOARD_USB_MUX_CONFIG app PRIVATE src/${TEST_BOARD_USB_MUX_CONFIG_SRC} ${PLATFORM_EC_PROGRAM_DIR}/skyrim/${CONFIG_TEST_BOARD_NAME}/src/usb_mux_config.c) diff --git a/zephyr/test/skyrim/tests/baseboard/CMakeLists.txt b/zephyr/test/skyrim/tests/baseboard/CMakeLists.txt new file mode 100644 index 0000000000..09db535985 --- /dev/null +++ b/zephyr/test/skyrim/tests/baseboard/CMakeLists.txt @@ -0,0 +1,5 @@ +# Copyright 2023 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +target_sources_ifdef(CONFIG_TEST_BOARD_USB_PD_POLICY app PRIVATE src/usb_pd_policy.c ${PLATFORM_EC_PROGRAM_DIR}/skyrim/src/usb_pd_policy.c)
\ No newline at end of file diff --git a/zephyr/test/skyrim/src/baseboard/usb_pd_policy.c b/zephyr/test/skyrim/tests/baseboard/src/usb_pd_policy.c index 1a8e5e8805..1a8e5e8805 100644 --- a/zephyr/test/skyrim/src/baseboard/usb_pd_policy.c +++ b/zephyr/test/skyrim/tests/baseboard/src/usb_pd_policy.c |