From patchwork Mon Mar 23 08:39:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 67026 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 40615A0563; Mon, 23 Mar 2020 09:42:33 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B7E2F1C065; Mon, 23 Mar 2020 09:42:31 +0100 (CET) Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by dpdk.org (Postfix) with ESMTP id 364281C037 for ; Mon, 23 Mar 2020 09:42:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584952949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VjoTkVtNBhYSN1UlWPKP168GriTLBjjyspATiMzB/6Y=; b=PdmyzLdQMqZi6NPskmgMSOLwLOuuH1UhKJrzr+LzgeD11iAhZg4On5DXoBwEhMFLuCvw6r ApIR1CmS7npjLHB2dF7mTIODGNZCjfGgFu4gulMshi2kpxkQrMhans3X9HjF0LhE/m4ml/ gBjakYSi8SQGy23R5orxQ3sgai/SQy4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-348-TkZdsAcGM4SAmLjGrWfbeg-1; Mon, 23 Mar 2020 04:42:25 -0400 X-MC-Unique: TkZdsAcGM4SAmLjGrWfbeg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B962D8C526B; Mon, 23 Mar 2020 08:41:10 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.193.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id 317805DAB0; Mon, 23 Mar 2020 08:41:03 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: aconole@redhat.com, ruifeng.wang@arm.com, stable@dpdk.org, Reshma Pattan Date: Mon, 23 Mar 2020 09:39:52 +0100 Message-Id: <20200323083952.12853-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH] test: load drivers when required 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" 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 Reviewed-by: Ruifeng Wang --- 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')