tests: drivers: watchdog: use Kconfig options for setup flags and timeout

Replace hard-coded platform definrs with Kconfig marcos

Signed-off-by: Quy Tran <[email protected]>

Author: quytranpzz

tests/drivers/watchdog/wdt_basic_reset_none/Kconfig

@@ -20,3 +20,15 @@ config TEST_WDT_SLEEP_TIME
 	  The units for this value will change based on the watchdog
 	  driver being tested. Most drivers represent this as milliseconds
 	  due to the max window reaching the millisecond feed window.
+
+config TEST_WDT_SETUP_FLAGS
+	int "WDT setup flags for test, selectable options are: No flags (0x0U), WDT_OPT_PAUSE_IN_SLEEP (0x1U), WDT_OPT_PAUSE_HALTED_BY_DBG (0x2U)"
+	default 2
+	help
+	  Set the watchdog setup flags for the test.
+
+config TEST_WDT_TIMEOUT_UNIT_TICKS
+	bool "Use watchdog timeout unit in ticks"
+	default n
+	help
+	  Enable this option to configure the watchdog timeout unit in system ticks

tests/drivers/watchdog/wdt_basic_reset_none/boards/app_ewm.conf

@@ -0,0 +1,2 @@
+CONFIG_TEST_WDT_SETUP_FLAGS=0
+CONFIG_TEST_WDT_TIMEOUT_UNIT_TICKS=y

tests/drivers/watchdog/wdt_basic_reset_none/boards/rsk_rx130_512kb.conf

@@ -0,0 +1 @@
+CONFIG_TEST_WDT_SETUP_FLAGS=0

tests/drivers/watchdog/wdt_basic_reset_none/src/main.c

@@ -7,7 +7,6 @@
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/watchdog.h>
 
-
 /*
  * To use this test, either the devicetree's /aliases must have a
  * 'watchdog0' property, or one of the following watchdog compatibles
@@ -19,18 +18,17 @@
 #define WDT_NODE DT_INST(0, nxp_s32_swt)
 #endif
 
-#define WDT_FEED_TRIES		2
-#define WDT_TEST_CB_TEST_VALUE	0xCB
-#define WDT_TIMEOUT_VALUE	CONFIG_TEST_WDT_MAX_WINDOW_TIME + 10
+#define WDT_FEED_TRIES         2
+#define WDT_TEST_CB_TEST_VALUE 0xCB
+#define WDT_TIMEOUT_VALUE      CONFIG_TEST_WDT_MAX_WINDOW_TIME + 10
+#define WDT_SETUP_FLAGS        CONFIG_TEST_WDT_SETUP_FLAGS
 
-#if defined(CONFIG_WDT_NXP_EWM)
-#define WDT_SETUP_FLAGS		0
-#define WDT_TIMEOUT		K_TICKS(WDT_TIMEOUT_VALUE)
-#define SLEEP_TIME		K_TICKS(CONFIG_TEST_WDT_SLEEP_TIME)
+#if defined(CONFIG_TEST_WDT_TIMEOUT_UNIT_TICKS)
+#define WDT_TIMEOUT K_TICKS(WDT_TIMEOUT_VALUE)
+#define SLEEP_TIME  K_TICKS(CONFIG_TEST_WDT_SLEEP_TIME)
 #else
-#define WDT_SETUP_FLAGS		WDT_OPT_PAUSE_HALTED_BY_DBG
-#define WDT_TIMEOUT		K_MSEC(WDT_TIMEOUT_VALUE)
-#define SLEEP_TIME		K_MSEC(CONFIG_TEST_WDT_SLEEP_TIME)
+#define WDT_TIMEOUT K_MSEC(WDT_TIMEOUT_VALUE)
+#define SLEEP_TIME  K_MSEC(CONFIG_TEST_WDT_SLEEP_TIME)
 #endif
 
 static struct wdt_timeout_cfg m_cfg_wdt0;
@@ -41,9 +39,8 @@ static volatile int wdt_feed_flag;
 static void wdt_callback(const struct device *dev, int channel_id)
 {
 	wdt_interrupted_flag += WDT_TEST_CB_TEST_VALUE;
-	zassert_equal(WDT_FEED_TRIES, wdt_feed_flag,
-			"%d: Invalid number of feeding (expected: %d)",
-			wdt_feed_flag, WDT_FEED_TRIES);
+	zassert_equal(WDT_FEED_TRIES, wdt_feed_flag, "%d: Invalid number of feeding (expected: %d)",
+		      wdt_feed_flag, WDT_FEED_TRIES);
 }
 
 static int test_wdt_callback_reset_none(void)
@@ -80,7 +77,7 @@ static int test_wdt_callback_reset_none(void)
 	wdt_feed_flag = 0;
 	wdt_interrupted_flag = 0;
 	for (int i = 0; i < WDT_FEED_TRIES; ++i) {
-		TC_PRINT("Feeding %d\n", i+1);
+		TC_PRINT("Feeding %d\n", i + 1);
 		wdt_feed(wdt, 0);
 		wdt_feed_flag++;
 		k_sleep(SLEEP_TIME);
@@ -95,8 +92,7 @@ static int test_wdt_callback_reset_none(void)
 		}
 	}
 
-	zassert_equal(wdt_interrupted_flag, WDT_TEST_CB_TEST_VALUE,
-			"wdt callback failed");
+	zassert_equal(wdt_interrupted_flag, WDT_TEST_CB_TEST_VALUE, "wdt callback failed");
 
 	err = wdt_disable(wdt);
 	if (err == -EPERM) {
@@ -132,7 +128,6 @@ static int test_wdt_bad_window_max(void)
 	return TC_FAIL;
 }
 
-
 ZTEST(wdt_basic_reset_none, test_wdt_callback_reset_none)
 {
 	switch (test_wdt_callback_reset_none()) {

tests/drivers/watchdog/wdt_basic_reset_none/testcase.yaml

@@ -27,7 +27,9 @@ tests:
       - frdm_mcxw72/mcxw727c/cpu0
       - mimxrt1180_evk/mimxrt1189/cm33
       - mimxrt1180_evk/mimxrt1189/cm7
-    extra_args: DTC_OVERLAY_FILE="boards/app_ewm.overlay"
+    extra_args:
+      - EXTRA_CONF_FILE="boards/app_ewm.conf"
+      - DTC_OVERLAY_FILE="boards/app_ewm.overlay"
     extra_configs:
       - CONFIG_TEST_WDT_MAX_WINDOW_TIME=254
       - CONFIG_TEST_WDT_SLEEP_TIME=68
@@ -37,7 +39,9 @@ tests:
       - frdm_ke17z
     integration_platforms:
       - frdm_ke17z
-    extra_args: DTC_OVERLAY_FILE="boards/frdm_ke1xz.overlay"
+    extra_args:
+      - EXTRA_CONF_FILE="boards/app_ewm.conf"
+      - DTC_OVERLAY_FILE="boards/frdm_ke1xz.overlay"
     extra_configs:
       - CONFIG_TEST_WDT_MAX_WINDOW_TIME=254
       - CONFIG_TEST_WDT_SLEEP_TIME=68