Skip to content

Commit e73d961

Browse files
committed
[nrf fromtree] tests: nrf: enable twister tests for nrf54l20pdk
Enabled the following tests on nrf54l20 - i2c_slave - clock_control_api - nrf_clock_calibration - nrf_lf_clock_start - onoff - retained_mem/api - uart_elementary - uart_errors - uart_mix_fifo_poll - uart_pm - uart_async_api - wdt_error_cases - wdt_basic_api - counter_basic_api - fcb - nrf/qdec Signed-off-by: Rafał Kuźnia <[email protected]> (cherry picked from commit 07ee796) Signed-off-by: Sebastian Głąb <[email protected]>
1 parent c8aea90 commit e73d961

File tree

1 file changed

+4
-0
lines changed
  • tests/drivers/watchdog/wdt_error_cases/src

1 file changed

+4
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,12 @@
4242
#define DEFAULT_WINDOW_MIN (0U)
4343

4444
/* Align tests to the specific target: */
45+
<<<<<<< HEAD
4546
#if defined(CONFIG_SOC_SERIES_NRF54LX) || defined(CONFIG_SOC_NRF54H20) || \
4647
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
4751
#define WDT_TEST_FLAGS \
4852
(WDT_DISABLE_SUPPORTED | WDT_FLAG_RESET_SOC_SUPPORTED | \
4953
WDT_FLAG_ONLY_ONE_TIMEOUT_VALUE_SUPPORTED | WDT_OPT_PAUSE_IN_SLEEP_SUPPORTED | \

0 commit comments

Comments
 (0)