Skip to content

Commit 95c8ded

Browse files
kszromek-nordicnvlsianpu
authored andcommitted
samples: smp_svr: correct regex for ble and non ble configs
Twister harness regex differentiated between BLE and non BLE configs. Signed-off-by: Krzysztof Szromek <[email protected]>
1 parent 5562169 commit 95c8ded

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sample.yaml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ common:
1111
- "Starting .*bootloader"
1212
- "Jumping to the .*image slot"
1313
- "smp_sample: build time"
14-
- "smp_bt_sample: Advertising successfully started"
1514
timeout: 15
1615
tags:
1716
- ci_samples_zephyr_subsys_mgmt_mcumgr_smp_svr
@@ -30,6 +29,7 @@ tests:
3029
- nrf54lv10dk/nrf54lv10a/cpuapp
3130
extra_args:
3231
- mcuboot_CONFIG_MCUBOOT_DOWNGRADE_PREVENTION=y
32+
3333
sample.mcumgr.smp_svr.encryption.rsa:
3434
platform_allow:
3535
- nrf52840dk/nrf52840
@@ -126,7 +126,8 @@ tests:
126126
extra_args:
127127
- SB_CONFIG_MCUBOOT_SIGNATURE_USING_KMU=y
128128
- SB_CONFIG_BOOT_SIGNATURE_TYPE_ED25519=y
129-
nsib.sample.mcumgr.smp_svr.kmu.basic:
129+
130+
sample.mcumgr.smp_svr.nsib.kmu.basic:
130131
platform_allow:
131132
- nrf54l15dk/nrf54l15/cpuapp
132133
- nrf54lm20dk/nrf54lm20a/cpuapp
@@ -222,6 +223,15 @@ tests:
222223
- nrf5340dk/nrf5340/cpuapp
223224
integration_platforms:
224225
- nrf5340dk/nrf5340/cpuapp
226+
harness_config: &bt_harness_config
227+
type: multi_line
228+
ordered: false
229+
regex:
230+
- "Starting .*bootloader"
231+
- "Jumping to the .*image slot"
232+
- "smp_sample: build time"
233+
- "smp_bt_sample: Advertising successfully started"
234+
225235
sample.mcumgr.smp_svr.bt.nrf54l15:
226236
tags: bluetooth
227237
extra_args: EXTRA_CONF_FILE="overlay-bt.conf"
@@ -231,6 +241,8 @@ tests:
231241
integration_platforms:
232242
- nrf54l15dk/nrf54l15/cpuapp
233243
- nrf54l15dk/nrf54l10/cpuapp
244+
harness_config: *bt_harness_config
245+
234246
sample.mcumgr.smp_svr.bt.nrf54l15dk.ext_flash:
235247
extra_args:
236248
- OVERLAY_CONFIG="overlay-bt.conf"
@@ -246,6 +258,8 @@ tests:
246258
- nrf54l15dk/nrf54l15/cpuapp
247259
- nrf54l15dk/nrf54l10/cpuapp
248260
- nrf54l15dk/nrf54l05/cpuapp
261+
harness_config: *bt_harness_config
262+
249263
sample.mcumgr.smp_svr.bt.nrf54h20dk:
250264
sysbuild: true
251265
extra_args:
@@ -258,6 +272,8 @@ tests:
258272
- nrf54h20dk/nrf54h20/cpuapp
259273
integration_platforms:
260274
- nrf54h20dk/nrf54h20/cpuapp
275+
harness_config: *bt_harness_config
276+
261277
sample.mcumgr.smp_svr.bt.nrf54h20dk.direct_xip_withrevert:
262278
sysbuild: true
263279
extra_args:
@@ -272,6 +288,8 @@ tests:
272288
- nrf54h20dk/nrf54h20/cpuapp
273289
integration_platforms:
274290
- nrf54h20dk/nrf54h20/cpuapp
291+
harness_config: *bt_harness_config
292+
275293
sample.mcumgr.smp_svr.serial.nrf54h20dk.ecdsa:
276294
sysbuild: true
277295
extra_args:
@@ -283,13 +301,7 @@ tests:
283301
- nrf54h20dk/nrf54h20/cpuapp
284302
integration_platforms:
285303
- nrf54h20dk/nrf54h20/cpuapp
286-
harness_config:
287-
type: multi_line
288-
ordered: true
289-
regex:
290-
- "Starting bootloader"
291-
- "Jumping to the first image slot"
292-
- "smp_sample: build time"
304+
293305
sample.mcumgr.smp_svr.bt.nrf54h20dk.direct_xip_withrequests:
294306
sysbuild: true
295307
extra_args:
@@ -304,3 +316,4 @@ tests:
304316
- nrf54h20dk/nrf54h20/cpuapp
305317
integration_platforms:
306318
- nrf54h20dk/nrf54h20/cpuapp
319+
harness_config: *bt_harness_config

0 commit comments

Comments
 (0)