From e63a513a9345d2fec2f4f1a22582700f9de51c20 Mon Sep 17 00:00:00 2001
From: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
Date: Fri, 10 Jan 2025 14:20:33 +0100
Subject: [PATCH] tests: Adjust to Twister changes in recording feature

Adjust testcase.yaml files to changes in Twister schema which
now allows multiple recording patterns ('record: regex:').

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
---
 tests/benchmarks/latency_measure/testcase.yaml  | 12 ++++++++----
 tests/benchmarks/posix/threads/testcase.yaml    |  3 ++-
 tests/benchmarks/sched_queues/testcase.yaml     |  2 +-
 tests/benchmarks/wait_queues/testcase.yaml      |  2 +-
 tests/kernel/timer/timer_behavior/testcase.yaml |  6 ++++--
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/tests/benchmarks/latency_measure/testcase.yaml b/tests/benchmarks/latency_measure/testcase.yaml
index a56dc6dedb7..e2efb4e3978 100644
--- a/tests/benchmarks/latency_measure/testcase.yaml
+++ b/tests/benchmarks/latency_measure/testcase.yaml
@@ -19,7 +19,8 @@ tests:
     harness_config:
       type: one_line
       record:
-        regex: "(?P<metric>.*) - (?P<description>.*):(?P<cycles>.*) cycles ,(?P<nanoseconds>.*) ns"
+        regex:
+          - "(?P<metric>.*) - (?P<description>.*):(?P<cycles>.*) cycles ,(?P<nanoseconds>.*) ns"
       regex:
         - "PROJECT EXECUTION SUCCESSFUL"
 
@@ -35,7 +36,8 @@ tests:
     harness_config:
       type: one_line
       record:
-        regex: "(?P<metric>.*) - (?P<description>.*):(?P<cycles>.*) cycles ,(?P<nanoseconds>.*) ns"
+        regex:
+          - "(?P<metric>.*) - (?P<description>.*):(?P<cycles>.*) cycles ,(?P<nanoseconds>.*) ns"
       regex:
         - "PROJECT EXECUTION SUCCESSFUL"
 
@@ -53,7 +55,8 @@ tests:
     harness_config:
       type: one_line
       record:
-        regex: "(?P<metric>.*) - (?P<description>.*):(?P<cycles>.*) cycles ,(?P<nanoseconds>.*) ns"
+        regex:
+          - "(?P<metric>.*) - (?P<description>.*):(?P<cycles>.*) cycles ,(?P<nanoseconds>.*) ns"
       regex:
         - "PROJECT EXECUTION SUCCESSFUL"
 
@@ -75,6 +78,7 @@ tests:
     harness_config:
       type: one_line
       record:
-        regex: "(?P<metric>.*) - (?P<description>.*):(?P<cycles>.*) cycles ,(?P<nanoseconds>.*) ns"
+        regex:
+          - "(?P<metric>.*) - (?P<description>.*):(?P<cycles>.*) cycles ,(?P<nanoseconds>.*) ns"
       regex:
         - "PROJECT EXECUTION SUCCESSFUL"
diff --git a/tests/benchmarks/posix/threads/testcase.yaml b/tests/benchmarks/posix/threads/testcase.yaml
index 9a7f2084f47..e9798b76a86 100644
--- a/tests/benchmarks/posix/threads/testcase.yaml
+++ b/tests/benchmarks/posix/threads/testcase.yaml
@@ -14,7 +14,8 @@ common:
   harness_config:
     type: one_line
     record:
-      regex: "(?P<api>.*), ALL, (?P<time>.*), (?P<threads>.*), (?P<cores>.*), (?P<rate>.*)"
+      regex:
+        - "(?P<api>.*), ALL, (?P<time>.*), (?P<threads>.*), (?P<cores>.*), (?P<rate>.*)"
     regex:
       - "PROJECT EXECUTION SUCCESSFUL"
 tests:
diff --git a/tests/benchmarks/sched_queues/testcase.yaml b/tests/benchmarks/sched_queues/testcase.yaml
index 4d8f691cb5d..495c7be1928 100644
--- a/tests/benchmarks/sched_queues/testcase.yaml
+++ b/tests/benchmarks/sched_queues/testcase.yaml
@@ -16,7 +16,7 @@ common:
       - "PROJECT EXECUTION SUCCESSFUL"
     record:
       regex:
-        "REC: (?P<metric>.*) - (?P<description>.*):(?P<cycles>.*) cycles ,(?P<nanoseconds>.*) ns"
+        - "REC: (?P<metric>.*) - (?P<description>.*):(?P<cycles>.*) cycles ,(?P<nanoseconds>.*) ns"
   extra_configs:
     - CONFIG_BENCHMARK_RECORDING=y
 
diff --git a/tests/benchmarks/wait_queues/testcase.yaml b/tests/benchmarks/wait_queues/testcase.yaml
index 898cf1f475b..d0c4189d461 100644
--- a/tests/benchmarks/wait_queues/testcase.yaml
+++ b/tests/benchmarks/wait_queues/testcase.yaml
@@ -15,7 +15,7 @@ common:
       - "PROJECT EXECUTION SUCCESSFUL"
     record:
       regex:
-        "REC: (?P<metric>.*) - (?P<description>.*):(?P<cycles>.*) cycles ,(?P<nanoseconds>.*) ns"
+        - "REC: (?P<metric>.*) - (?P<description>.*):(?P<cycles>.*) cycles ,(?P<nanoseconds>.*) ns"
   extra_configs:
     - CONFIG_BENCHMARK_RECORDING=y
 
diff --git a/tests/kernel/timer/timer_behavior/testcase.yaml b/tests/kernel/timer/timer_behavior/testcase.yaml
index 7e1b725ffba..10c6d3039f2 100644
--- a/tests/kernel/timer/timer_behavior/testcase.yaml
+++ b/tests/kernel/timer/timer_behavior/testcase.yaml
@@ -10,7 +10,8 @@ tests:
       - renode
     harness_config:
       record:
-        regex: "RECORD:(?P<metrics>.*)"
+        regex:
+          - "RECORD:(?P<metrics>.*)"
         as_json: ['metrics']
   kernel.timer.timer_behavior_external:
     filter: dt_compat_enabled("test-kernel-timer-behavior-external")
@@ -20,7 +21,8 @@ tests:
                     'address=127.0.0.1,port=10430,channel=1,sample-rate=6_250_000,threshold-volts=3.3']
       fixture: gpio_timerout
       record:
-        regex: "RECORD:(?P<metrics>.*)"
+        regex:
+          - "RECORD:(?P<metrics>.*)"
         as_json: ['metrics']
     extra_configs:
       - CONFIG_TIMER_EXTERNAL_TEST=y