DPDK patches and discussions
 help / color / mirror / Atom feed
From: Aaron Conole <aconole@redhat.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
	Luca Boccassi <bluca@debian.org>,
	Reshma Pattan <reshma.pattan@intel.com>,
	Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>,
	David Marchand <dmarchan@redhat.com>
Subject: [dpdk-dev] [PATCH 3/3] app/test/meson: auto detect number of cores
Date: Thu, 11 Apr 2019 15:52:29 -0400	[thread overview]
Message-ID: <20190411195229.7841-4-aconole@redhat.com> (raw)
Message-ID: <20190411195229.ZpAF6pk4M5mJDIcfMcKO7sx_9WJtrmEpf36JhwzguBE@z> (raw)
In-Reply-To: <20190411195229.7841-1-aconole@redhat.com>

The arguments being passed will cause failures on laptops that have,
for instance, 2 cores only.  Most of the tests don't require more
than a single core.  Some require multiple cores (but those tests
should be modified to 'SKIP' when the correct number of cores
aren't available).

The unit test results shouldn't be impacted by this change, but it
allows for a future enhancement to pass flags such as '--no-huge'.

Also include a fix to a reported issue with running on FreeBSD.

Signed-off-by: Aaron Conole <aconole@redhat.com>
---
Conflicts with http://patches.dpdk.org/patch/50850/

 app/test/meson.build | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/test/meson.build b/app/test/meson.build
index 867cc5863..1010bfbc8 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -344,17 +344,32 @@ if get_option('tests')
 	timeout_seconds = 600
 	timeout_seconds_fast = 10
 
+	# Retreive the number of CPU cores
+	num_cores = run_command('lscpu', '-p=cpu').stdout().strip().split('\n')[-1]
+	num_cores_arg = '-l 0-' + num_cores
+
+	test_args = [num_cores_arg, '-n 4']
 	foreach arg : fast_parallel_test_names
-		test(arg, dpdk_test,
-			env : ['DPDK_TEST=' + arg],
-			args : ['-c f','-n 4', '--file-prefix=@0@'.format(arg)],
+		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,
+			suite : 'fast-tests')
+		else
+			test(arg, dpdk_test,
+				env : ['DPDK_TEST=' + arg],
+				args : test_args,
 			timeout : timeout_seconds_fast,
 			suite : 'fast-tests')
+		endif
 	endforeach
 
 	foreach arg : fast_non_parallel_test_names
 		test(arg, dpdk_test,
 			env : ['DPDK_TEST=' + arg],
+			args : test_args,
 			timeout : timeout_seconds_fast,
 			is_parallel : false,
 			suite : 'fast-tests')
@@ -363,6 +378,7 @@ if get_option('tests')
 	foreach arg : perf_test_names
 		test(arg, dpdk_test,
 		env : ['DPDK_TEST=' + arg],
+		args : test_args,
 		timeout : timeout_seconds,
 		is_parallel : false,
 		suite : 'perf-tests')
@@ -371,6 +387,7 @@ if get_option('tests')
 	foreach arg : driver_test_names
 		test(arg, dpdk_test,
 			env : ['DPDK_TEST=' + arg],
+			args : test_args,
 			timeout : timeout_seconds,
 			is_parallel : false,
 			suite : 'driver-tests')
@@ -379,6 +396,7 @@ if get_option('tests')
 	foreach arg : dump_test_names
 		test(arg, dpdk_test,
 			env : ['DPDK_TEST=' + arg],
+			args : test_args,
 			timeout : timeout_seconds,
 			is_parallel : false,
 			suite : 'debug-tests')
-- 
2.19.1


  parent reply	other threads:[~2019-04-11 19:53 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-11 19:52 [dpdk-dev] [PATCH 0/3] travis: enhancements for build (plus a meson fix) Aaron Conole
2019-04-11 19:52 ` Aaron Conole
2019-04-11 19:52 ` [dpdk-dev] [PATCH 1/3] travis: enable ccache Aaron Conole
2019-04-11 19:52   ` Aaron Conole
2019-04-12  7:46   ` David Marchand
2019-04-12  7:46     ` David Marchand
2019-04-12  9:16   ` Luca Boccassi
2019-04-12  9:16     ` Luca Boccassi
2019-04-11 19:52 ` [dpdk-dev] [PATCH 2/3] travis: add a distinguisher to the 'extra' builds Aaron Conole
2019-04-11 19:52   ` Aaron Conole
2019-04-12  7:46   ` David Marchand
2019-04-12  7:46     ` David Marchand
2019-04-12  9:17   ` Luca Boccassi
2019-04-12  9:17     ` Luca Boccassi
2019-04-11 19:52 ` Aaron Conole [this message]
2019-04-11 19:52   ` [dpdk-dev] [PATCH 3/3] app/test/meson: auto detect number of cores Aaron Conole
2019-04-12  7:46   ` David Marchand
2019-04-12  7:46     ` David Marchand
2019-04-12  9:06     ` Bruce Richardson
2019-04-12  9:06       ` Bruce Richardson
2019-04-12  9:17   ` Luca Boccassi
2019-04-12  9:17     ` Luca Boccassi
2019-04-12 16:21 ` [dpdk-dev] [PATCH v2 0/3] travis: enhancements for build (plus a meson fix) Aaron Conole
2019-04-12 16:21   ` Aaron Conole
2019-04-12 16:21   ` [dpdk-dev] [PATCH v2 1/3] travis: enable ccache Aaron Conole
2019-04-12 16:21     ` Aaron Conole
2019-04-12 16:21   ` [dpdk-dev] [PATCH v2 2/3] travis: add a distinguisher to the 'extra' builds Aaron Conole
2019-04-12 16:21     ` Aaron Conole
2019-04-12 16:21   ` [dpdk-dev] [PATCH v2 3/3] app/test/meson: auto detect number of cores Aaron Conole
2019-04-12 16:21     ` Aaron Conole
2019-04-12 16:36     ` Bruce Richardson
2019-04-12 16:36       ` Bruce Richardson
2019-04-12 18:21       ` Aaron Conole
2019-04-12 18:21         ` Aaron Conole
2019-04-15  9:14         ` Bruce Richardson
2019-04-15  9:14           ` Bruce Richardson
2019-04-17 12:09   ` [dpdk-dev] [PATCH v2 0/3] travis: enhancements for build (plus a meson fix) Thomas Monjalon
2019-04-17 12:09     ` Thomas Monjalon

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=20190411195229.7841-4-aconole@redhat.com \
    --to=aconole@redhat.com \
    --cc=agalyax.babu.radhakrishnan@intel.com \
    --cc=bluca@debian.org \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=dmarchan@redhat.com \
    --cc=reshma.pattan@intel.com \
    /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).