[dpdk-stable] patch 'test: load drivers when required' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. 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.

Thanks.

Luca Boccassi

---
>From 796af72c2d1256dca48669c593151f1f914b8343 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Mon, 23 Mar 2020 20:59:22 +0100
Subject: [PATCH] test: load drivers when required

[ upstream commit 7d0c2354a5953dd1e40dd2b97c106214822c06a4 ]

Concatenating to test_args if event_eth_tx_adapter_autotest is executed
makes all subsequent tests inherit from the drivers loading while this
is unneeded.

Fixes: 207b1c813f39 ("test: fix build without ring PMD")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang at arm.com>
Acked-by: Aaron Conole <aconole at redhat.com>
---
 app/test/meson.build | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/test/meson.build b/app/test/meson.build
index 8cb90c4993..8524a986a1 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -402,37 +402,33 @@ timeout_seconds_fast = 10
 get_coremask = find_program('get-coremask.sh')
 num_cores_arg = '-l ' + run_command(get_coremask).stdout().strip()
 
-test_args = [num_cores_arg]
+default_test_args = [num_cores_arg]
 
 foreach arg : fast_test_names
+	test_args = default_test_args
+
 	if (get_option('default_library') == 'shared' and
 		arg == 'event_eth_tx_adapter_autotest')
 		foreach drv:dpdk_drivers
 			test_args += ['-d', drv.full_path().split('.a')[0] + '.so']
 		endforeach
 	endif
-	if host_machine.system() == 'linux'
-		test(arg, dpdk_test,
-			  env : ['DPDK_TEST=' + arg],
-			  args : test_args +
-				 ['--file-prefix=@0@'.format(arg)],
-		timeout : timeout_seconds_fast,
-		is_parallel : false,
-		suite : 'fast-tests')
-	else
-		test(arg, dpdk_test,
-			env : ['DPDK_TEST=' + arg],
-			args : test_args,
-		timeout : timeout_seconds_fast,
-		is_parallel : false,
-		suite : 'fast-tests')
+	if is_linux
+		test_args += ['--file-prefix=@0@'.format(arg)]
 	endif
+
+	test(arg, dpdk_test,
+		env : ['DPDK_TEST=' + arg],
+		args : test_args,
+		timeout : timeout_seconds_fast,
+		is_parallel : false,
+		suite : 'fast-tests')
 endforeach
 
 foreach arg : perf_test_names
 	test(arg, dpdk_test,
 	env : ['DPDK_TEST=' + arg],
-	args : test_args,
+	args : default_test_args,
 	timeout : timeout_seconds,
 	is_parallel : false,
 	suite : 'perf-tests')
@@ -441,7 +437,7 @@ endforeach
 foreach arg : driver_test_names
 	test(arg, dpdk_test,
 		env : ['DPDK_TEST=' + arg],
-		args : test_args,
+		args : default_test_args,
 		timeout : timeout_seconds,
 		is_parallel : false,
 		suite : 'driver-tests')
@@ -450,7 +446,7 @@ endforeach
 foreach arg : dump_test_names
 	test(arg, dpdk_test,
 		env : ['DPDK_TEST=' + arg],
-		args : test_args,
+		args : default_test_args,
 		timeout : timeout_seconds,
 		is_parallel : false,
 		suite : 'debug-tests')
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:20.895430270 +0100
+++ 0050-test-load-drivers-when-required.patch	2020-05-19 13:56:18.279502899 +0100
@@ -1,14 +1,15 @@
-From 7d0c2354a5953dd1e40dd2b97c106214822c06a4 Mon Sep 17 00:00:00 2001
+From 796af72c2d1256dca48669c593151f1f914b8343 Mon Sep 17 00:00:00 2001
 From: David Marchand <david.marchand at redhat.com>
 Date: Mon, 23 Mar 2020 20:59:22 +0100
 Subject: [PATCH] test: load drivers when required
 
+[ upstream commit 7d0c2354a5953dd1e40dd2b97c106214822c06a4 ]
+
 Concatenating to test_args if event_eth_tx_adapter_autotest is executed
 makes all subsequent tests inherit from the drivers loading while this
 is unneeded.
 
 Fixes: 207b1c813f39 ("test: fix build without ring PMD")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Marchand <david.marchand at redhat.com>
 Reviewed-by: Ruifeng Wang <ruifeng.wang at arm.com>
@@ -18,10 +19,10 @@
  1 file changed, 15 insertions(+), 19 deletions(-)
 
 diff --git a/app/test/meson.build b/app/test/meson.build
-index 0a2ce710f0..7ab2b586e1 100644
+index 8cb90c4993..8524a986a1 100644
 --- a/app/test/meson.build
 +++ b/app/test/meson.build
-@@ -403,37 +403,33 @@ timeout_seconds_fast = 10
+@@ -402,37 +402,33 @@ timeout_seconds_fast = 10
  get_coremask = find_program('get-coremask.sh')
  num_cores_arg = '-l ' + run_command(get_coremask).stdout().strip()
  
@@ -72,7 +73,7 @@
  	timeout : timeout_seconds,
  	is_parallel : false,
  	suite : 'perf-tests')
-@@ -442,7 +438,7 @@ endforeach
+@@ -441,7 +437,7 @@ endforeach
  foreach arg : driver_test_names
  	test(arg, dpdk_test,
  		env : ['DPDK_TEST=' + arg],
@@ -81,7 +82,7 @@
  		timeout : timeout_seconds,
  		is_parallel : false,
  		suite : 'driver-tests')
-@@ -451,7 +447,7 @@ endforeach
+@@ -450,7 +446,7 @@ endforeach
  foreach arg : dump_test_names
  	test(arg, dpdk_test,
  		env : ['DPDK_TEST=' + arg],