From b91f10b06929c7934df64889a2d037c28950c398 Mon Sep 17 00:00:00 2001 From: Nordic Builder Date: Thu, 10 Apr 2025 06:23:47 +0000 Subject: [PATCH 1/2] manifest: Update sdk-zephyr revision (auto-manifest PR) Automatically created by Github Action Signed-off-by: Nordic Builder --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 4849c2867e4f..95124a593f4f 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 231cc2964814da82c866ec9c61d8e59097d43591 + revision: pull/2740/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From 7ac477e774a475dec6d5630273c4dd02180d26a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Chru=C5=9Bci=C5=84ski?= Date: Tue, 20 May 2025 15:17:38 +0200 Subject: [PATCH 2/2] tests: zephyr: drivers: timer: nrf_grtc_timer: Update config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Align test configuration with Zephyr test. Signed-off-by: Krzysztof Chruściński --- .../drivers/timer/nrf_grtc_timer/prj.conf | 3 ++ .../timer/nrf_grtc_timer/testcase.yaml | 50 ++++++++++--------- west.yml | 2 +- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/tests/zephyr/drivers/timer/nrf_grtc_timer/prj.conf b/tests/zephyr/drivers/timer/nrf_grtc_timer/prj.conf index dea03477519d..90b4e5f2d191 100644 --- a/tests/zephyr/drivers/timer/nrf_grtc_timer/prj.conf +++ b/tests/zephyr/drivers/timer/nrf_grtc_timer/prj.conf @@ -1,2 +1,5 @@ CONFIG_ZTEST=y CONFIG_NRF_GRTC_TIMER=y +CONFIG_COUNTER=y +CONFIG_TEST_RANDOM_GENERATOR=y +CONFIG_XOSHIRO_RANDOM_GENERATOR=y diff --git a/tests/zephyr/drivers/timer/nrf_grtc_timer/testcase.yaml b/tests/zephyr/drivers/timer/nrf_grtc_timer/testcase.yaml index 5c9fb6362f8d..9bc1b9443875 100644 --- a/tests/zephyr/drivers/timer/nrf_grtc_timer/testcase.yaml +++ b/tests/zephyr/drivers/timer/nrf_grtc_timer/testcase.yaml @@ -1,24 +1,28 @@ +common: + tags: + - drivers + - ci_tests_zephyr_drivers_timer + platform_allow: + - nrf54lm20pdk/nrf54lm20a/cpuapp + - nrf54lm20pdk/nrf54lm20a/cpuflpr + - nrf54lm20pdk@0.0.0/nrf54lm20a/cpuapp + - nrf54lm20pdk@0.0.0/nrf54lm20a/cpuflpr + - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp + - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuflpr + - nrf54lm20pdk@0.2.0.csp/nrf54lm20a/cpuapp + - nrf54lm20pdk@0.2.0.csp/nrf54lm20a/cpuflpr + - nrf54lv10dk/nrf54lv10a/cpuapp + - nrf54lv10dk@0.0.0/nrf54lv10a/cpuapp + - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp + - nrf54lv10dk/nrf54lv10a/cpuflpr + - nrf54lv10dk@0.0.0/nrf54lv10a/cpuflpr + - nrf54lv10dk@0.2.0/nrf54lv10a/cpuflpr + integration_platforms: + - nrf54lm20pdk/nrf54lm20a/cpuapp + - nrf54lv10dk/nrf54lv10a/cpuapp + timeout: 45 tests: - nrf.extended.drivers.timer.nrf_grtc_timer: - tags: - - drivers - - ci_tests_zephyr_drivers_timer - platform_allow: - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54lm20pdk/nrf54lm20a/cpuflpr - - nrf54lm20pdk@0.0.0/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.0.0/nrf54lm20a/cpuflpr - - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0/nrf54lm20a/cpuflpr - - nrf54lm20pdk@0.2.0.csp/nrf54lm20a/cpuapp - - nrf54lm20pdk@0.2.0.csp/nrf54lm20a/cpuflpr - - nrf54lv10dk/nrf54lv10a/cpuapp - - nrf54lv10dk@0.0.0/nrf54lv10a/cpuapp - - nrf54lv10dk@0.2.0/nrf54lv10a/cpuapp - - nrf54lv10dk/nrf54lv10a/cpuflpr - - nrf54lv10dk@0.0.0/nrf54lv10a/cpuflpr - - nrf54lv10dk@0.2.0/nrf54lv10a/cpuflpr - integration_platforms: - - nrf54lm20pdk/nrf54lm20a/cpuapp - - nrf54lv10dk/nrf54lv10a/cpuapp - timeout: 30 + nrf.extended.drivers.timer.nrf_grtc_timer: {} + nrf.extended.drivers.timer.nrf_grtc_timer.no_assert: + extra_configs: + - CONFIG_ASSERT=n diff --git a/west.yml b/west.yml index 95124a593f4f..691168976d0e 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: pull/2740/head + revision: 8af4f9f53d90c24ce275dc364aa035eb544a155e import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above