summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Zieba <robertzieba@google.com>2023-02-15 16:54:03 +0000
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-02-22 20:08:46 +0000
commit554dbe4f8ab9d4613adae9a659f6552ee671a1ef (patch)
treef90cd0a6069861109d595d70667bb7d8f648c961
parenta892f6d05eccd0995ac9ba76d44b3d4605641ceb (diff)
downloadchrome-ec-554dbe4f8ab9d4613adae9a659f6552ee671a1ef.tar.gz
zephyr/test/skyrim: Refactor common code
Move common code as the first step of a larger refactor. BRANCH=none BUG=b:247151116 TEST=Ran skyrim tests Change-Id: Ic527a71629d899e3f46463898373ded7314d9867 Signed-off-by: Robert Zieba <robertzieba@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4263554 Reviewed-by: Abe Levkoy <alevkoy@chromium.org> Reviewed-by: Diana Z <dzigterman@chromium.org>
-rw-r--r--zephyr/test/skyrim/CMakeLists.txt4
-rw-r--r--zephyr/test/skyrim/tests/common/CMakeLists.txt5
-rw-r--r--zephyr/test/skyrim/tests/common/src/common.c (renamed from zephyr/test/skyrim/src/common.c)0
3 files changed, 8 insertions, 1 deletions
diff --git a/zephyr/test/skyrim/CMakeLists.txt b/zephyr/test/skyrim/CMakeLists.txt
index 72f995d0c0..8745c0804e 100644
--- a/zephyr/test/skyrim/CMakeLists.txt
+++ b/zephyr/test/skyrim/CMakeLists.txt
@@ -10,7 +10,9 @@ zephyr_include_directories("${PLATFORM_EC_PROGRAM_DIR}/skyrim/include")
add_subdirectory(${PLATFORM_EC}/zephyr/test/test_utils test_utils)
-target_sources(app PRIVATE src/common.c src/${CONFIG_TEST_BOARD_NAME}/common.c)
+add_subdirectory(tests/common)
+
+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)
diff --git a/zephyr/test/skyrim/tests/common/CMakeLists.txt b/zephyr/test/skyrim/tests/common/CMakeLists.txt
new file mode 100644
index 0000000000..251f7e6ad5
--- /dev/null
+++ b/zephyr/test/skyrim/tests/common/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(app PRIVATE src/common.c) \ No newline at end of file
diff --git a/zephyr/test/skyrim/src/common.c b/zephyr/test/skyrim/tests/common/src/common.c
index b369d0bdaa..b369d0bdaa 100644
--- a/zephyr/test/skyrim/src/common.c
+++ b/zephyr/test/skyrim/tests/common/src/common.c