zephyr/test/skyrim: Refactor ppc_config tests

Move ppc_config tests to match new code structure.

BRANCH=none
BUG=b:247151116
TEST=Ran skyrim tests

Change-Id: If6237b909a92b775006b9125eccf1b3c0bd341ee
Signed-off-by: Robert Zieba <robertzieba@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4263556
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>

7 files changed, 24 insertions, 15 deletions

diff --git a/zephyr/test/skyrim/CMakeLists.txt b/zephyr/test/skyrim/CMakeLists.txt
index dcc15cd460..061931c7fb 100644
--- a/zephyr/test/skyrim/CMakeLists.txt
+++ b/zephyr/test/skyrim/CMakeLists.txt
@@ -12,10 +12,10 @@ add_subdirectory(${PLATFORM_EC}/zephyr/test/test_utils test_utils)
 
 add_subdirectory(tests/common)
 add_subdirectory_ifdef(CONFIG_TEST_BOARD_BASEBOARD tests/baseboard)
+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_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_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 99013c0f6f..52261d8c73 100644
--- a/zephyr/test/skyrim/Kconfig
+++ b/zephyr/test/skyrim/Kconfig
@@ -71,12 +71,10 @@ config TEST_BOARD_USB_PD_POLICY
 
 config TEST_BOARD_PPC_CONFIG
 	bool "Enable PPC config tests"
-	default n
 
-config TEST_BOARD_PPC_CONFIG_SRC
-	string "Source file to use for this test"
-	default "common/ppc_config.c"
-	depends on TEST_BOARD_PPC
+config TEST_BOARD_PPC_CONFIG_CUSTOM
+	bool "ENable PPC config tests with a variant-specific test file"
+	select TEST_BOARD_PPC_CONFIG
 
 config TEST_BOARD_USB_MUX_CONFIG
 	bool "Enable USB mux config tests"
diff --git a/zephyr/test/skyrim/testcase.yaml b/zephyr/test/skyrim/testcase.yaml
index d2330c740b..83c7727a7a 100644
--- a/zephyr/test/skyrim/testcase.yaml
+++ b/zephyr/test/skyrim/testcase.yaml
@@ -51,11 +51,11 @@ tests:
     - CONFIG_TEST_BOARD_FROSTFLOW=y
     - CONFIG_TEST_BOARD_PPC_CONFIG=y
 
-  # skyrim.frostflow.usb_mux_config:
-  #   extra_configs:
-  #   - CONFIG_TEST_BOARD_FROSTFLOW=y
-  #   - CONFIG_TEST_BOARD_USB_MUX_CONFIG=y
-  #   - CONFIG_TEST_BOARD_USB_MUX_CONFIG_SRC="frostflow/usb_mux_config.c"
+#  skyrim.frostflow.usb_mux_config:
+#    extra_configs:
+#    - CONFIG_TEST_BOARD_FROSTFLOW=y
+#    - CONFIG_TEST_BOARD_USB_MUX_CONFIG=y
+#    - CONFIG_TEST_BOARD_USB_MUX_CONFIG_SRC="frostflow/usb_mux_config.c"
 
   # Markarth tests
   skyrim.markarth:
@@ -100,5 +100,4 @@ tests:
   skyrim.winterhold.ppc_config:
     extra_configs:
     - CONFIG_TEST_BOARD_WINTERHOLD=y
-    - CONFIG_TEST_BOARD_PPC_CONFIG=y
-    - CONFIG_TEST_BOARD_PPC_CONFIG_SRC="winterhold/ppc_config.c"
+    - CONFIG_TEST_BOARD_PPC_CONFIG_CUSTOM=y
diff --git a/zephyr/test/skyrim/tests/common/CMakeLists.txt b/zephyr/test/skyrim/tests/common/CMakeLists.txt
index 251f7e6ad5..a7e59e686a 100644
--- a/zephyr/test/skyrim/tests/common/CMakeLists.txt
+++ b/zephyr/test/skyrim/tests/common/CMakeLists.txt
@@ -2,4 +2,12 @@
 # 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
+target_sources(app PRIVATE src/common.c)
+
+# 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)
+	if (NOT DEFINED CONFIG_TEST_BOARD_PPC_CONFIG_CUSTOM)
+		target_sources(app PRIVATE src/ppc_config.c)
+	endif()
+endif()
\ No newline at end of file
diff --git a/zephyr/test/skyrim/src/common/ppc_config.c b/zephyr/test/skyrim/tests/common/src/ppc_config.c
index 0721e9c313..0721e9c313 100644
--- a/zephyr/test/skyrim/src/common/ppc_config.c
+++ b/zephyr/test/skyrim/tests/common/src/ppc_config.c
diff --git a/zephyr/test/skyrim/tests/winterhold/CMakeLists.txt b/zephyr/test/skyrim/tests/winterhold/CMakeLists.txt
new file mode 100644
index 0000000000..b45811b826
--- /dev/null
+++ b/zephyr/test/skyrim/tests/winterhold/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_PPC_CONFIG app PRIVATE src/ppc_config.c)
\ No newline at end of file
diff --git a/zephyr/test/skyrim/src/winterhold/ppc_config.c b/zephyr/test/skyrim/tests/winterhold/src/ppc_config.c
index 131a74855e..4fce497faf 100644
--- a/zephyr/test/skyrim/src/winterhold/ppc_config.c
+++ b/zephyr/test/skyrim/tests/winterhold/src/ppc_config.c
@@ -9,7 +9,6 @@
 #include <usbc_ppc.h>
 
 FAKE_VOID_FUNC(nx20p348x_interrupt, int);
-DEFINE_FAKE_VOID_FUNC(nx20p348x_interrupt, int);
 
 static void ppc_config_before(void *fixture)
 {