From e73d9617b668bbed59c3e6ff1e951a9fa1dda99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Fri, 13 Dec 2024 14:52:54 +0100 Subject: [PATCH] [nrf fromtree] tests: nrf: enable twister tests for nrf54l20pdk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 07ee796c7d40fe8a7ccc8198aa3ef53c2f371dae) Signed-off-by: Sebastian Głąb --- tests/drivers/watchdog/wdt_error_cases/src/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/drivers/watchdog/wdt_error_cases/src/main.c b/tests/drivers/watchdog/wdt_error_cases/src/main.c index 990b2b52c98..e792f2524de 100644 --- a/tests/drivers/watchdog/wdt_error_cases/src/main.c +++ b/tests/drivers/watchdog/wdt_error_cases/src/main.c @@ -42,8 +42,12 @@ #define DEFAULT_WINDOW_MIN (0U) /* Align tests to the specific target: */ +<<<<<<< HEAD #if defined(CONFIG_SOC_SERIES_NRF54LX) || defined(CONFIG_SOC_NRF54H20) || \ defined(CONFIG_SOC_NRF9280) +======= +#if defined(CONFIG_SOC_SERIES_NRF54LX) || defined(CONFIG_SOC_NRF9280) +>>>>>>> [nrf fromtree] tests: nrf: enable twister tests for nrf54l20pdk #define WDT_TEST_FLAGS \ (WDT_DISABLE_SUPPORTED | WDT_FLAG_RESET_SOC_SUPPORTED | \ WDT_FLAG_ONLY_ONE_TIMEOUT_VALUE_SUPPORTED | WDT_OPT_PAUSE_IN_SLEEP_SUPPORTED | \