From patchwork Fri Mar 29 17:22:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 51931 X-Patchwork-Delegate: thomas@monjalon.net 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 F0C114CAB; Fri, 29 Mar 2019 18:22:53 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A50251B05 for ; Fri, 29 Mar 2019 18:22:45 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1ABB01E2CC for ; Fri, 29 Mar 2019 17:22:45 +0000 (UTC) Received: from dhcp-25.97.bos.redhat.com (ovpn-121-152.rdu2.redhat.com [10.10.121.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8FFC60BFB for ; Fri, 29 Mar 2019 17:22:44 +0000 (UTC) From: Aaron Conole To: dev@dpdk.org Date: Fri, 29 Mar 2019 13:22:40 -0400 Message-Id: <20190329172241.11916-3-aconole@redhat.com> In-Reply-To: <20190329172241.11916-1-aconole@redhat.com> References: <20190329172241.11916-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 29 Mar 2019 17:22:45 +0000 (UTC) Subject: [dpdk-dev] [RFC 2/3] meson-tests: separate slower tests 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" When running some tests in the CI environment, the run time can take in excess of 10 minutes to produce output. This causes the entire CI run not to succeed. Separate these tests so that they can be run from a normal environment, and deselected in a CI environment. There's also a small whitespace fix bundled in for the perf_tests block. Signed-off-by: Aaron Conole --- app/test/meson.build | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 975b38daa..1b0ff0523 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -171,7 +171,6 @@ fast_parallel_test_names = [ 'red_autotest', 'ring_autotest', 'ring_pmd_autotest', - 'rwlock_autotest', 'sched_autotest', 'spinlock_autotest', 'string_autotest', @@ -214,15 +213,21 @@ fast_non_parallel_test_names = [ 'thash_autotest', ] +# These test cases are non-parallel and also take > 10m to execute in +# some environments (such as CI systems), so allow deselecting them +slow_test_names = [ + 'rwlock_autotest', + 'mempool_perf_autotest', + 'reciprocal_division', + 'reciprocal_division_perf', +] + # All test cases in perf_test_names list are non-parallel perf_test_names = [ 'ring_perf_autotest', - 'mempool_perf_autotest', 'memcpy_perf_autotest', 'hash_perf_autotest', 'timer_perf_autotest', - 'reciprocal_division', - 'reciprocal_division_perf', 'lpm_perf_autotest', 'red_all', 'barrier_autotest', @@ -332,7 +337,7 @@ if get_option('tests') install_rpath: driver_install_path, install: false) - # some perf tests (eg: memcpy perf autotest)take very long + # some tests (eg: the slow tests) take very long # to complete, so timeout to 10 minutes timeout_seconds = 600 timeout_seconds_fast = 10 @@ -359,13 +364,22 @@ if get_option('tests') suite : 'fast-tests') endforeach + foreach arg : slow_test_names + test(arg, dpdk_test, + env : ['DPDK_TEST=' + arg], + args : test_args + ['--file-prefix=@0@'.format(arg)], + timeout : timeout_seconds, + is_parallel : false, + suite : 'slow-tests') + endforeach + foreach arg : perf_test_names test(arg, dpdk_test, - env : ['DPDK_TEST=' + arg], - args : test_args + ['--file-prefix=@0@'.format(arg)], - timeout : timeout_seconds, - is_parallel : false, - suite : 'perf-tests') + env : ['DPDK_TEST=' + arg], + args : test_args + ['--file-prefix=@0@'.format(arg)], + timeout : timeout_seconds, + is_parallel : false, + suite : 'perf-tests') endforeach foreach arg : driver_test_names