[dpdk-stable] patch 'devtools: fix test of some build options' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/16/19. 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.

Kevin Traynor

---
>From d8405f091dbde1fa11f05bf6960b8e15ad20f2d5 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 12 Feb 2019 23:20:37 +0100
Subject: [PATCH] devtools: fix test of some build options

[ upstream commit 8fdac86abd2fe5a5a7fa332066b2ceeffca52d37 ]

CONFIG_RTE_LIBRTE_PMD_ISAL was not tested because of a typo.

CONFIG_RTE_LIBRTE_PMD_QAT_SYM was not tested since it has been
introduced and made CONFIG_RTE_LIBRTE_PMD_QAT enabled by default.

While at it, DPDK_DEP_JSON is now checked for "y",
as other DPDK_DEP_* variables, instead of non-empty.

Fixes: 3c32e89f68e1 ("compress/isal: add skeleton ISA-L compression PMD")
Fixes: 7a34c2155716 ("compress/qat: add empty driver")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Fiona Trahe <fiona.trahe at intel.com>
---
 devtools/test-build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/devtools/test-build.sh b/devtools/test-build.sh
index 0511ae6d0..d37b121ca 100755
--- a/devtools/test-build.sh
+++ b/devtools/test-build.sh
@@ -151,5 +151,5 @@ config () # <directory> <target> <options>
 		sed -ri       's,(RESOURCE_TAR=)n,\1y,' $1/.config
 		test "$DPDK_DEP_ISAL" != y || \
-		sed -ri           's,(ISAL_PMD=)n,\1y,' $1/.config
+		sed -ri           's,(PMD_ISAL=)n,\1y,' $1/.config
 		test "$DPDK_DEP_MLX" != y || \
 		sed -ri           's,(MLX._PMD=)n,\1y,' $1/.config
@@ -181,5 +181,5 @@ config () # <directory> <target> <options>
 		sed -ri        's,(PMD_OPENSSL=)n,\1y,' $1/.config
 		test "$DPDK_DEP_SSL" != y || \
-		sed -ri            's,(PMD_QAT=)n,\1y,' $1/.config
+		sed -ri            's,(QAT_SYM=)n,\1y,' $1/.config
 		test -z "$FLEXRAN_SDK" || \
 		sed -ri     's,(BBDEV_TURBO_SW=)n,\1y,' $1/.config
@@ -193,5 +193,5 @@ config () # <directory> <target> <options>
 		test "$DPDK_DEP_ELF" != y || \
 		sed -ri            's,(BPF_ELF=)n,\1y,' $1/.config
-		test -z "$DPDK_DEP_JSON" || \
+		test "$DPDK_DEP_JSON" != y || \
 		sed -ri          's,(TELEMETRY=)n,\1y,' $1/.config
 		build_config_hook $1 $2 $3
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-10 14:06:09.892408075 +0100
+++ 0025-devtools-fix-test-of-some-build-options.patch	2019-04-10 14:06:07.842294747 +0100
@@ -1,8 +1,10 @@
-From 8fdac86abd2fe5a5a7fa332066b2ceeffca52d37 Mon Sep 17 00:00:00 2001
+From d8405f091dbde1fa11f05bf6960b8e15ad20f2d5 Mon Sep 17 00:00:00 2001
 From: Thomas Monjalon <thomas at monjalon.net>
 Date: Tue, 12 Feb 2019 23:20:37 +0100
 Subject: [PATCH] devtools: fix test of some build options
 
+[ upstream commit 8fdac86abd2fe5a5a7fa332066b2ceeffca52d37 ]
+
 CONFIG_RTE_LIBRTE_PMD_ISAL was not tested because of a typo.
 
 CONFIG_RTE_LIBRTE_PMD_QAT_SYM was not tested since it has been
@@ -13,7 +15,6 @@
 
 Fixes: 3c32e89f68e1 ("compress/isal: add skeleton ISA-L compression PMD")
 Fixes: 7a34c2155716 ("compress/qat: add empty driver")
-Cc: stable at dpdk.org
 
 Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
 Acked-by: Fiona Trahe <fiona.trahe at intel.com>