patch 'test/bpf: skip test if libpcap is unavailable' has been queued to stable release 21.11.2

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.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 05/15/22. 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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/a25197930d58fc754bd9c91d55db31d521ddcb5f

Thanks.

Kevin

---
From a25197930d58fc754bd9c91d55db31d521ddcb5f Mon Sep 17 00:00:00 2001
From: Tyler Retzlaff <roretzla@linux.microsoft.com>
Date: Tue, 22 Mar 2022 00:12:35 -0700
Subject: [PATCH] test/bpf: skip test if libpcap is unavailable

[ upstream commit 55ae8965bf8eecd5ebec36663bb0f36018abf64b ]

test_bpf_convert is being conditionally registered depending on the
presence of RTE_HAS_LIBPCAP except the UT unconditionally lists it as a
test to run.

When the UT runs test_bpf_convert test-dpdk can't find the registration
and assumes the DPDK_TEST environment variable hasn't been defined
resulting in test-dpdk dropping to interactive mode and subsequently
waiting for the remainder of the UT fast-test timeout period before
reporting the test as having timed out.

* unconditionally register test_bpf_convert,
* if ! RTE_HAS_LIBPCAP provide a stub test_bpf_convert that reports the
  test is skipped similar to that done with the test_bpf test.

Fixes: 2eccf6afbea9 ("bpf: add function to convert classic BPF to DPDK BPF")

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 app/test/test_bpf.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c
index c422fedf1f..d70bb0fe85 100644
--- a/app/test/test_bpf.c
+++ b/app/test/test_bpf.c
@@ -3251,5 +3251,14 @@ test_bpf(void)
 REGISTER_TEST_COMMAND(bpf_autotest, test_bpf);
 
-#ifdef RTE_HAS_LIBPCAP
+#ifndef RTE_HAS_LIBPCAP
+
+static int
+test_bpf_convert(void)
+{
+	printf("BPF convert RTE_HAS_LIBPCAP is undefined, skipping test\n");
+	return TEST_SKIPPED;
+}
+
+#else
 #include <pcap/pcap.h>
 
@@ -3449,4 +3458,5 @@ test_bpf_convert(void)
 }
 
-REGISTER_TEST_COMMAND(bpf_convert_autotest, test_bpf_convert);
 #endif /* RTE_HAS_LIBPCAP */
+
+REGISTER_TEST_COMMAND(bpf_convert_autotest, test_bpf_convert);
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-05-10 13:24:21.709057716 +0100
+++ 0004-test-bpf-skip-test-if-libpcap-is-unavailable.patch	2022-05-10 13:24:21.551646292 +0100
@@ -1 +1 @@
-From 55ae8965bf8eecd5ebec36663bb0f36018abf64b Mon Sep 17 00:00:00 2001
+From a25197930d58fc754bd9c91d55db31d521ddcb5f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 55ae8965bf8eecd5ebec36663bb0f36018abf64b ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index 805cce6406..97f500809e 100644
+index c422fedf1f..d70bb0fe85 100644
@@ -34 +35 @@
-@@ -3265,5 +3265,14 @@ test_bpf(void)
+@@ -3251,5 +3251,14 @@ test_bpf(void)
@@ -50 +51 @@
-@@ -3463,4 +3472,5 @@ test_bpf_convert(void)
+@@ -3449,4 +3458,5 @@ test_bpf_convert(void)