patch 'test/trace: fix parallel execution with traces enabled' has been queued to stable release 23.11.7

[Shani Peretz]

Hi,

FYI, your patch has been queued to stable release 23.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/19/26. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/shanipr/dpdk-stable

This queued commit can be viewed at:
https://github.com/shanipr/dpdk-stable/commit/75f4797df1c57e82e5a760b880a7c3e12fefa2d4

Thanks.

Shani

---
>From 75f4797df1c57e82e5a760b880a7c3e12fefa2d4 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Thu, 5 Mar 2026 09:51:02 -0800
Subject: [PATCH] test/trace: fix parallel execution with traces enabled

[ upstream commit 07b697b29741c080a6f125a96a5ef5f68249a34d ]

The trace_autotest_with_traces test needs a unique file-prefix to avoid
collisions when running in parallel with other tests.

Rather than duplicating test argument construction, restructure to add
file-prefix as the last step. This allows reusing test_args for the
trace variant by concatenating the trace-specific arguments and a
different file-prefix at the end.

Fixes: 0aeaf75df879 ("test: define unit tests suites based on test types")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
 app/test/suites/meson.build | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/test/suites/meson.build b/app/test/suites/meson.build
index d2cecd40ea..90d8e020f2 100644
--- a/app/test/suites/meson.build
+++ b/app/test/suites/meson.build
@@ -59,26 +59,29 @@ foreach suite:test_suites
                     or get_option('b_sanitize') == 'address,undefined')
                 continue  # skip this test
             endif
-            if is_linux
-                # use unique file-prefix to allow parallel runs
-                test_args += ['--file-prefix=' + test_name.underscorify()]
-            endif
-
             if get_option('default_library') == 'shared'
                 test_args += ['-d', dpdk_drivers_build_dir]
             endif
 
+            # use unique file-prefix to allow parallel runs
+            file_prefix = []
+            trace_prefix = []
+            if is_linux
+                file_prefix = ['--file-prefix=' + test_name.underscorify()]
+                trace_prefix = [file_prefix[0] + '_with_traces']
+            endif
+
             test(test_name, dpdk_test,
-                args : test_args,
+                args : test_args + file_prefix,
                 env: ['DPDK_TEST=' + test_name],
                 timeout : timeout_seconds_fast,
                 is_parallel : false,
                 suite : 'fast-tests')
             if not is_windows and test_name == 'trace_autotest'
-                test_args += ['--trace=.*']
-                test_args += ['--trace-dir=@0@'.format(meson.current_build_dir())]
+                trace_extra = ['--trace=.*',
+                               '--trace-dir=@0@'.format(meson.current_build_dir())]
                 test(test_name + '_with_traces', dpdk_test,
-                    args : test_args,
+                    args : test_args + trace_extra + trace_prefix,
                     env: ['DPDK_TEST=' + test_name],
                     timeout : timeout_seconds_fast,
                     is_parallel : false,
-- 
2.43.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-04-14 14:44:33.784812378 +0300
+++ 0052-test-trace-fix-parallel-execution-with-traces-enable.patch	2026-04-14 14:44:28.650407000 +0300
@@ -1 +1 @@
-From 07b697b29741c080a6f125a96a5ef5f68249a34d Mon Sep 17 00:00:00 2001
+From 75f4797df1c57e82e5a760b880a7c3e12fefa2d4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 07b697b29741c080a6f125a96a5ef5f68249a34d ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 4c815ea097..786c459c24 100644
+index d2cecd40ea..90d8e020f2 100644
@@ -26,2 +27,2 @@
-@@ -90,26 +90,29 @@ foreach suite:test_suites
-             if not asan and get_option('b_sanitize').contains('address')
+@@ -59,26 +59,29 @@ foreach suite:test_suites
+                     or get_option('b_sanitize') == 'address,undefined')