We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent c8aea90 commit e73d961Copy full SHA for e73d961
tests/drivers/watchdog/wdt_error_cases/src/main.c
@@ -42,8 +42,12 @@
42
#define DEFAULT_WINDOW_MIN (0U)
43
44
/* Align tests to the specific target: */
45
+<<<<<<< HEAD
46
#if defined(CONFIG_SOC_SERIES_NRF54LX) || defined(CONFIG_SOC_NRF54H20) || \
47
defined(CONFIG_SOC_NRF9280)
48
+=======
49
+#if defined(CONFIG_SOC_SERIES_NRF54LX) || defined(CONFIG_SOC_NRF9280)
50
+>>>>>>> [nrf fromtree] tests: nrf: enable twister tests for nrf54l20pdk
51
#define WDT_TEST_FLAGS \
52
(WDT_DISABLE_SUPPORTED | WDT_FLAG_RESET_SOC_SUPPORTED | \
53
WDT_FLAG_ONLY_ONE_TIMEOUT_VALUE_SUPPORTED | WDT_OPT_PAUSE_IN_SLEEP_SUPPORTED | \
0 commit comments