summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatryk Duda <pdk@semihalf.com>2022-12-21 13:55:33 +0100
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-12-22 22:42:10 +0000
commit966040b0ca9e5f9a6081b622f47d6693171fe44c (patch)
tree50ed3a32c6c5c94a40eaaec16b4dfad7a3c0fd9f
parentf6bcb51d2d26a0470d955700c9e5bf7ab0d0eeba (diff)
downloadchrome-ec-966040b0ca9e5f9a6081b622f47d6693171fe44c.tar.gz
zephyr/test/drivers: Move flash test to separate directory
Moving flash tests to separate directory will allow to create a variant of these tests with different options enabled. BUG=b:239712345 BRANCH=none TEST=./twister -v -T zephyr/test/drivers/ --test \ external/platform/ec/zephyr/test/drivers/drivers.flash Signed-off-by: Patryk Duda <pdk@semihalf.com> Change-Id: Ifa8f350a27abe73d87794f6a4dcc13e34c7b6092 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4118761 Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com> Reviewed-by: Abe Levkoy <alevkoy@chromium.org> Tested-by: Patryk Duda <patrykd@google.com> Commit-Queue: Patryk Duda <patrykd@google.com>
-rw-r--r--zephyr/test/drivers/CMakeLists.txt1
-rw-r--r--zephyr/test/drivers/Kconfig5
-rw-r--r--zephyr/test/drivers/default/CMakeLists.txt1
-rw-r--r--zephyr/test/drivers/flash/CMakeLists.txt7
-rw-r--r--zephyr/test/drivers/flash/src/flash.c (renamed from zephyr/test/drivers/default/src/flash.c)0
-rw-r--r--zephyr/test/drivers/testcase.yaml3
6 files changed, 16 insertions, 1 deletions
diff --git a/zephyr/test/drivers/CMakeLists.txt b/zephyr/test/drivers/CMakeLists.txt
index 00328367e3..13727e8ffa 100644
--- a/zephyr/test/drivers/CMakeLists.txt
+++ b/zephyr/test/drivers/CMakeLists.txt
@@ -20,6 +20,7 @@ add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_COMMON_CBI common_cbi)
add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_COMMON_CBI_GPIO common_cbi_gpio)
add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_COMMON_CHARGER common_charger)
add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_CHARGESPLASH chargesplash)
+add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_FLASH flash)
add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_ISL923X isl923x)
add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_I2C_CONTROLLER i2c_controller)
add_subdirectory_ifdef(CONFIG_LINK_TEST_SUITE_KEYBOARD_SCAN keyboard_scan)
diff --git a/zephyr/test/drivers/Kconfig b/zephyr/test/drivers/Kconfig
index 14f3d6b513..9bcf6b2b99 100644
--- a/zephyr/test/drivers/Kconfig
+++ b/zephyr/test/drivers/Kconfig
@@ -32,6 +32,11 @@ config LINK_TEST_SUITE_COMMON_CBI_GPIO
config LINK_TEST_SUITE_COMMON_CHARGER
bool "Link and execute the common/charger.c tests"
+config LINK_TEST_SUITE_FLASH
+ bool "Link and execute the common/flash.c tests"
+ help
+ Include the test suite exercising flash-related code in the binary.
+
config LINK_TEST_SUITE_HOST_COMMANDS
select PLATFORM_EC_CHARGE_STATE_DEBUG
bool "Link and test the host command tests"
diff --git a/zephyr/test/drivers/default/CMakeLists.txt b/zephyr/test/drivers/default/CMakeLists.txt
index 08d5caa04b..3b022d0562 100644
--- a/zephyr/test/drivers/default/CMakeLists.txt
+++ b/zephyr/test/drivers/default/CMakeLists.txt
@@ -51,7 +51,6 @@ target_sources(app PRIVATE
src/console_cmd/waitms.c
src/cros_cbi.c
src/espi.c
- src/flash.c
src/gpio.c
src/integration/usbc/usb.c
src/integration/usbc/usb_20v_3a_pd_charger.c
diff --git a/zephyr/test/drivers/flash/CMakeLists.txt b/zephyr/test/drivers/flash/CMakeLists.txt
new file mode 100644
index 0000000000..18fa892831
--- /dev/null
+++ b/zephyr/test/drivers/flash/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Copyright 2022 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/flash.c
+)
diff --git a/zephyr/test/drivers/default/src/flash.c b/zephyr/test/drivers/flash/src/flash.c
index e0c6743cde..e0c6743cde 100644
--- a/zephyr/test/drivers/default/src/flash.c
+++ b/zephyr/test/drivers/flash/src/flash.c
diff --git a/zephyr/test/drivers/testcase.yaml b/zephyr/test/drivers/testcase.yaml
index 818a3e4515..d89abaa62a 100644
--- a/zephyr/test/drivers/testcase.yaml
+++ b/zephyr/test/drivers/testcase.yaml
@@ -89,6 +89,9 @@ tests:
extra_args: CONF_FILE="prj.conf;dps/prj.conf"
extra_configs:
- CONFIG_LINK_TEST_SUITE_USB_PD_DPS=y
+ drivers.flash:
+ extra_configs:
+ - CONFIG_LINK_TEST_SUITE_FLASH=y
drivers.host_cmd:
extra_configs:
- CONFIG_LINK_TEST_SUITE_HOST_COMMANDS=y