diff options
| author | Robert Zieba <robertzieba@google.com> | 2023-02-16 22:17:49 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-02-22 20:09:29 +0000 |
| commit | b4428922254f21db25dddcbb543b5af4f0e3b99c (patch) | |
| tree | 22ff1d81a5f4da46faecd807fd89112babe01d26 | |
| parent | a29409f3a6f55cbaa54ce7e42e0bb1c24d0ff8de (diff) | |
| download | chrome-ec-b4428922254f21db25dddcbb543b5af4f0e3b99c.tar.gz | |
zephyr/test/skyrim: Refactor alt charger tests
Refactor alt charger tests to match new code structure.
BRANCH=none
BUG=b:247151116
TEST=Ran skyrim tests
Change-Id: I18b6c4bd01c6451172d8bceb66e1ade73a87634b
Signed-off-by: Robert Zieba <robertzieba@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4263557
Reviewed-by: Diana Z <dzigterman@chromium.org>
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
| -rw-r--r-- | zephyr/test/skyrim/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | zephyr/test/skyrim/Kconfig | 7 | ||||
| -rw-r--r-- | zephyr/test/skyrim/tests/common/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | zephyr/test/skyrim/tests/common/src/alt_charger.c (renamed from zephyr/test/skyrim/src/common/alt_charger.c) | 0 |
4 files changed, 11 insertions, 5 deletions
diff --git a/zephyr/test/skyrim/CMakeLists.txt b/zephyr/test/skyrim/CMakeLists.txt index 061931c7fb..c4c53ca855 100644 --- a/zephyr/test/skyrim/CMakeLists.txt +++ b/zephyr/test/skyrim/CMakeLists.txt @@ -16,6 +16,5 @@ add_subdirectory_ifdef(CONFIG_TEST_BOARD_WINTERHOLD tests/winterhold) 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_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/Kconfig b/zephyr/test/skyrim/Kconfig index 52261d8c73..f4c830d7a2 100644 --- a/zephyr/test/skyrim/Kconfig +++ b/zephyr/test/skyrim/Kconfig @@ -51,10 +51,9 @@ config TEST_BOARD_NAME config TEST_BOARD_ALT_CHARGER bool "Enable alt charger specific tests" -config TEST_BOARD_ALT_CHARGER_SRC - string "Source file to use for this test" - default "common/alt_charger.c" - depends on TEST_BOARD_ALT_CHARGER +config TEST_BOARD_ALT_CHARGER_CUSTOM + bool "ENable alt charger tests with a variant-specific test file" + select TEST_BOARD_ALT_CHARGER config TEST_BOARD_FAN bool "Enable fan tests" diff --git a/zephyr/test/skyrim/tests/common/CMakeLists.txt b/zephyr/test/skyrim/tests/common/CMakeLists.txt index a7e59e686a..52f21d1ec2 100644 --- a/zephyr/test/skyrim/tests/common/CMakeLists.txt +++ b/zephyr/test/skyrim/tests/common/CMakeLists.txt @@ -4,6 +4,14 @@ target_sources(app PRIVATE src/common.c) +# Alt charger +if (DEFINED CONFIG_TEST_BOARD_ALT_CHARGER) + target_sources(app PRIVATE ${PLATFORM_EC_PROGRAM_DIR}/skyrim/${CONFIG_TEST_BOARD_NAME}/src/alt_charger.c) + if (NOT DEFINED CONFIG_TEST_BOARD_ALT_CHARGER_CUSTOM) + target_sources(app PRIVATE src/alt_charger.c) + endif() +endif() + # PPC config if (DEFINED CONFIG_TEST_BOARD_PPC_CONFIG) target_sources(app PRIVATE ${PLATFORM_EC_PROGRAM_DIR}/skyrim/${CONFIG_TEST_BOARD_NAME}/src/ppc_config.c) diff --git a/zephyr/test/skyrim/src/common/alt_charger.c b/zephyr/test/skyrim/tests/common/src/alt_charger.c index c03d31aaeb..c03d31aaeb 100644 --- a/zephyr/test/skyrim/src/common/alt_charger.c +++ b/zephyr/test/skyrim/tests/common/src/alt_charger.c |