DPDK patches and discussions
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: aconole@redhat.com, ruifeng.wang@arm.com,
	maicolgabriel@hotmail.com, bruce.richardson@intel.com,
	stable@dpdk.org, Reshma Pattan <reshma.pattan@intel.com>
Subject: [dpdk-dev] [PATCH v4 1/5] test: load drivers when required
Date: Mon, 23 Mar 2020 20:59:22 +0100	[thread overview]
Message-ID: <20200323195926.12182-2-david.marchand@redhat.com> (raw)
In-Reply-To: <20200323195926.12182-1-david.marchand@redhat.com>

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@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
---
 app/test/meson.build | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/test/meson.build b/app/test/meson.build
index 0a2ce710f0..7ab2b586e1 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -403,37 +403,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,
+	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')
-	endif
 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')
@@ -442,7 +438,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')
@@ -451,7 +447,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.23.0


  reply	other threads:[~2020-03-23 19:59 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-23 19:59 [dpdk-dev] [PATCH v4 0/5] no-huge unit test David Marchand
2020-03-23 19:59 ` David Marchand [this message]
2020-03-23 21:01   ` [dpdk-dev] [PATCH v4 1/5] test: load drivers when required Aaron Conole
2020-03-23 19:59 ` [dpdk-dev] [PATCH v4 2/5] test: skip subtests in no-huge mode David Marchand
2020-03-23 19:59 ` [dpdk-dev] [PATCH v4 3/5] test: allow no-huge mode for fast-tests David Marchand
2020-03-23 19:59 ` [dpdk-dev] [PATCH v4 4/5] ci: run tests even without hugepage David Marchand
2020-03-23 19:59 ` [dpdk-dev] [PATCH v4 5/5] ci: enable unit test for aarch64 David Marchand
2020-03-24 10:06 ` [dpdk-dev] [PATCH v4 0/5] no-huge unit test David Marchand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200323195926.12182-2-david.marchand@redhat.com \
    --to=david.marchand@redhat.com \
    --cc=aconole@redhat.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=maicolgabriel@hotmail.com \
    --cc=reshma.pattan@intel.com \
    --cc=ruifeng.wang@arm.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).