d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/bpf: skip test if libpcap is unavailable

Browse Source 
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")
Cc: stable@dpdk.org

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
This commit is contained in:
Tyler Retzlaff 2022-03-22 00:12:35 -07:00 committed by David Marchand
parent 8001c0ddfe
commit 55ae8965bf
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/test/test_bpf.c
View File

@ -3264,7 +3264,16 @@ 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>
static void
@ -3462,5 +3471,6 @@ test_bpf_convert(void)
return rc;
}
REGISTER_TEST_COMMAND(bpf_convert_autotest, test_bpf_convert);
#endif /* RTE_HAS_LIBPCAP */
REGISTER_TEST_COMMAND(bpf_convert_autotest, test_bpf_convert);