[dpdk-stable] patch 'devtools: fix debug build test' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/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 b24bf09e457f4789f9700a14bb7feb9c696e8c58 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Mon, 16 Dec 2019 15:45:32 +0100
Subject: [PATCH] devtools: fix debug build test

[ upstream commit 924e55fb340623f03fdf2ff7fbcfd78819d1db25 ]

When testing build with +debug options, the statistics are enabled.
It was wrongly matching CONFIG_RTE_IBVERBS_LINK_STATIC.
The pattern is fixed to match only statistics config options.

Fixes: 2c0dd7b69fb0 ("config: add static linkage of mlx dependency")

Reported-by: Ali Alnubani <alialnu at mellanox.com>
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
---
 devtools/test-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/test-build.sh b/devtools/test-build.sh
index be565a1bea..52305fbb8c 100755
--- a/devtools/test-build.sh
+++ b/devtools/test-build.sh
@@ -149,7 +149,7 @@ config () # <directory> <target> <options>
 		! echo $3 | grep -q '+debug' || ( \
 		sed -ri=""  's,(RTE_LOG_DP_LEVEL=).*,\1RTE_LOG_DEBUG,' $1/.config
 		sed -ri=""           's,(_DEBUG.*=)n,\1y,' $1/.config
-		sed -ri=""            's,(_STAT.*=)n,\1y,' $1/.config
+		sed -ri=""  's,(_STAT)([S_].*=|=)n,\1\2y,' $1/.config
 		sed -ri="" 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config )
 
 		# Automatic configuration
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:39.097124067 +0000
+++ 0005-devtools-fix-debug-build-test.patch	2020-02-11 11:17:38.303999552 +0000
@@ -1,14 +1,15 @@
-From 924e55fb340623f03fdf2ff7fbcfd78819d1db25 Mon Sep 17 00:00:00 2001
+From b24bf09e457f4789f9700a14bb7feb9c696e8c58 Mon Sep 17 00:00:00 2001
 From: Thomas Monjalon <thomas at monjalon.net>
 Date: Mon, 16 Dec 2019 15:45:32 +0100
 Subject: [PATCH] devtools: fix debug build test
 
+[ upstream commit 924e55fb340623f03fdf2ff7fbcfd78819d1db25 ]
+
 When testing build with +debug options, the statistics are enabled.
 It was wrongly matching CONFIG_RTE_IBVERBS_LINK_STATIC.
 The pattern is fixed to match only statistics config options.
 
 Fixes: 2c0dd7b69fb0 ("config: add static linkage of mlx dependency")
-Cc: stable at dpdk.org
 
 Reported-by: Ali Alnubani <alialnu at mellanox.com>
 Signed-off-by: Thomas Monjalon <thomas at monjalon.net>