From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 90AF6A0093 for ; Tue, 19 May 2020 14:59:53 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 87F321D5DE; Tue, 19 May 2020 14:59:53 +0200 (CEST) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by dpdk.org (Postfix) with ESMTP id BAE9E1D62F for ; Tue, 19 May 2020 14:59:51 +0200 (CEST) Received: by mail-wr1-f47.google.com with SMTP id w7so15746539wre.13 for ; Tue, 19 May 2020 05:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wkCHx86zlTcaBNtEa1Rib9NIDY6lU27h+Id191FBMHM=; b=SqiIp7MhVNNBiPb3y+OKf2lkUCAg/IAafoMxOQTmOAZajfapTcs96rEcWtBtvGjE8d zy8sa/camCYlPFpZdHguhBtboNwkRYRECrj9HuqvAvGCQJq7Mj5tS2hnXj0l3P8ixHDE h+dZx6zLuEZFGhaJWGj+OUv2NlNPZ3mVDkwVjrcauGtW6NxcaHxxOlVWrtQBBbLl3fZK fbsLOj4oc9kgm+XpopEj5VXtJeN+HasnzAxQ+X7NZ8TgscRvPjygFwqk72Kb2tjhC5CL X1hTC3ALB1h+U9RCl8jzGjwnILur/tIxyUq1sbHPdchOVzwu7vzkqEyD4in3xwCsM6bW xZKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wkCHx86zlTcaBNtEa1Rib9NIDY6lU27h+Id191FBMHM=; b=qhh769MHeSgwpLRwtqU3PdP4NgRtQaLge9Kj2vDCaMmrW0IZlBz0yvUg1ryD/cW61D E6lv/7SVC5A8K5a2lafSoXmd3en0gjBAfoZOX4vlYPiJBi4/RTbQp3zMSnmML+KyhTZE fTR4FsTIYlYFAu81ApceeGsIhZlhuJbNtQ2LpStDn3k8kLGtAnEHFNizNP8IMg9DAV3B xwRwZU/TtbjCLWtRqkixrYT8NGUTQUYjZxdw3xOxrzveTFtS/kqzDWhsCg4gYFxS8NaM uDgfFl7s4coN7oyUgapsAvCwocJ5KknFoAMgVRtgzytfqOYVQjYwS6tZTVqDoJ/jyNof TSVw== X-Gm-Message-State: AOAM530AxQ58t/pTLTcRi7AkAiaJu6NcoMp3XSidHRc4IXvrwpPOuXcB XYvkI4T+WDPlri0sKexzGXM= X-Google-Smtp-Source: ABdhPJzFKaOoifWzj/tjCAaThAyPz1cUgftY3g8G48OFpdXr+Km+H1fUWgLswRoLZf38kIItqTs1hA== X-Received: by 2002:a5d:6448:: with SMTP id d8mr27266404wrw.118.1589893191514; Tue, 19 May 2020 05:59:51 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y10sm22154927wrd.95.2020.05.19.05.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:59:50 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Ruifeng Wang , Aaron Conole , dpdk stable Date: Tue, 19 May 2020 13:54:00 +0100 Message-Id: <20200519125804.104349-50-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test: load drivers when required' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 796af72c2d1256dca48669c593151f1f914b8343 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 23 Mar 2020 20:59:22 +0100 Subject: [PATCH] test: load drivers when required [ upstream commit 7d0c2354a5953dd1e40dd2b97c106214822c06a4 ] 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") Signed-off-by: David Marchand Reviewed-by: Ruifeng Wang Acked-by: Aaron Conole --- app/test/meson.build | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 8cb90c4993..8524a986a1 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -402,37 +402,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, - timeout : timeout_seconds_fast, - is_parallel : false, - suite : 'fast-tests') + 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') 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') @@ -441,7 +437,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') @@ -450,7 +446,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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:20.895430270 +0100 +++ 0050-test-load-drivers-when-required.patch 2020-05-19 13:56:18.279502899 +0100 @@ -1,14 +1,15 @@ -From 7d0c2354a5953dd1e40dd2b97c106214822c06a4 Mon Sep 17 00:00:00 2001 +From 796af72c2d1256dca48669c593151f1f914b8343 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 23 Mar 2020 20:59:22 +0100 Subject: [PATCH] test: load drivers when required +[ upstream commit 7d0c2354a5953dd1e40dd2b97c106214822c06a4 ] + 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 @@ -18,10 +19,10 @@ 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build -index 0a2ce710f0..7ab2b586e1 100644 +index 8cb90c4993..8524a986a1 100644 --- a/app/test/meson.build +++ b/app/test/meson.build -@@ -403,37 +403,33 @@ timeout_seconds_fast = 10 +@@ -402,37 +402,33 @@ timeout_seconds_fast = 10 get_coremask = find_program('get-coremask.sh') num_cores_arg = '-l ' + run_command(get_coremask).stdout().strip() @@ -72,7 +73,7 @@ timeout : timeout_seconds, is_parallel : false, suite : 'perf-tests') -@@ -442,7 +438,7 @@ endforeach +@@ -441,7 +437,7 @@ endforeach foreach arg : driver_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], @@ -81,7 +82,7 @@ timeout : timeout_seconds, is_parallel : false, suite : 'driver-tests') -@@ -451,7 +447,7 @@ endforeach +@@ -450,7 +446,7 @@ endforeach foreach arg : dump_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg],