From patchwork Thu Apr 11 19:52:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 52653 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 215DC4CAB; Thu, 11 Apr 2019 21:52:39 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 128733772 for ; Thu, 11 Apr 2019 21:52:33 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6E277C067C2B; Thu, 11 Apr 2019 19:52:32 +0000 (UTC) Received: from dhcp-25.97.bos.redhat.com (unknown [10.18.25.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBD2C600CC; Thu, 11 Apr 2019 19:52:31 +0000 (UTC) From: Aaron Conole To: dev@dpdk.org Cc: Bruce Richardson , Luca Boccassi , Reshma Pattan , Agalya Babu RadhaKrishnan , David Marchand Date: Thu, 11 Apr 2019 15:52:27 -0400 Message-Id: <20190411195229.7841-2-aconole@redhat.com> In-Reply-To: <20190411195229.7841-1-aconole@redhat.com> References: <20190411195229.7841-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 11 Apr 2019 19:52:32 +0000 (UTC) Subject: [dpdk-dev] [PATCH 1/3] travis: enable ccache X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" We try to make the planet happy travis builds dpdk. Also, the 'sudo' flag was recently deprecated. Drop it. Suggested-by: Luca Boccassi Signed-off-by: Aaron Conole Reviewed-by: David Marchand Acked-by: Luca Boccassi --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3045eada5..72f8671b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: c +cache: ccache compiler: - gcc - clang @@ -24,8 +25,6 @@ extra_packages: &extra_packages before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh -sudo: false - env: - DEF_LIB="static" - DEF_LIB="shared" From patchwork Thu Apr 11 19:52:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 52654 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CD53E4F94; Thu, 11 Apr 2019 21:52:42 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id ED4B53772 for ; Thu, 11 Apr 2019 21:52:33 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4578FC033499; Thu, 11 Apr 2019 19:52:33 +0000 (UTC) Received: from dhcp-25.97.bos.redhat.com (unknown [10.18.25.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90866600CC; Thu, 11 Apr 2019 19:52:32 +0000 (UTC) From: Aaron Conole To: dev@dpdk.org Cc: Bruce Richardson , Luca Boccassi , Reshma Pattan , Agalya Babu RadhaKrishnan , David Marchand Date: Thu, 11 Apr 2019 15:52:28 -0400 Message-Id: <20190411195229.7841-3-aconole@redhat.com> In-Reply-To: <20190411195229.7841-1-aconole@redhat.com> References: <20190411195229.7841-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 11 Apr 2019 19:52:33 +0000 (UTC) Subject: [dpdk-dev] [PATCH 2/3] travis: add a distinguisher to the 'extra' builds X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This helps in two ways: 1. When looking at travis page for dpdk, it's a visual distinction 2. For ccache support, the build IDs include the 'env', so we get unique cache data. Signed-off-by: Aaron Conole Reviewed-by: David Marchand Acked-by: Luca Boccassi --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 72f8671b1..7b167fa64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,49 +45,49 @@ matrix: apt: packages: - *aarch64_packages - - env: DEF_LIB="static" + - env: DEF_LIB="static" EXTRA_PACKAGES=1 compiler: gcc addons: apt: packages: - *extra_packages - - env: DEF_LIB="shared" + - env: DEF_LIB="shared" EXTRA_PACKAGES=1 compiler: gcc addons: apt: packages: - *extra_packages - - env: DEF_LIB="static" OPTS="-Denable_kmods=false" + - env: DEF_LIB="static" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1 compiler: gcc addons: apt: packages: - *extra_packages - - env: DEF_LIB="shared" OPTS="-Denable_kmods=false" + - env: DEF_LIB="shared" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1 compiler: gcc addons: apt: packages: - *extra_packages - - env: DEF_LIB="static" + - env: DEF_LIB="static" EXTRA_PACKAGES=1 compiler: clang addons: apt: packages: - *extra_packages - - env: DEF_LIB="shared" + - env: DEF_LIB="shared" EXTRA_PACKAGES=1 compiler: clang addons: apt: packages: - *extra_packages - - env: DEF_LIB="static" OPTS="-Denable_kmods=false" + - env: DEF_LIB="static" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1 compiler: clang addons: apt: packages: - *extra_packages - - env: DEF_LIB="shared" OPTS="-Denable_kmods=false" + - env: DEF_LIB="shared" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1 compiler: clang addons: apt: From patchwork Thu Apr 11 19:52:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 52655 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 91516532C; Thu, 11 Apr 2019 21:52:45 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id C1BE94CA7 for ; Thu, 11 Apr 2019 21:52:34 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1879019D2BD; Thu, 11 Apr 2019 19:52:34 +0000 (UTC) Received: from dhcp-25.97.bos.redhat.com (unknown [10.18.25.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 649FE600CC; Thu, 11 Apr 2019 19:52:33 +0000 (UTC) From: Aaron Conole To: dev@dpdk.org Cc: Bruce Richardson , Luca Boccassi , Reshma Pattan , Agalya Babu RadhaKrishnan , David Marchand Date: Thu, 11 Apr 2019 15:52:29 -0400 Message-Id: <20190411195229.7841-4-aconole@redhat.com> In-Reply-To: <20190411195229.7841-1-aconole@redhat.com> References: <20190411195229.7841-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 11 Apr 2019 19:52:34 +0000 (UTC) Subject: [dpdk-dev] [PATCH 3/3] app/test/meson: auto detect number of cores X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Reviewed-by: David Marchand Acked-by: Luca Boccassi --- 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')