test/bpf: skip test if libpcap is unavailable
PATCH 1/1 test/bpf: skip test if libpcap is unavailable
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.
--- app/test/test_bpf.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
app/test/test_bpf.c +12 -2
@@ -3264,7 +3264,16 @@ struct bpf_test {REGISTER_TEST_COMMAND (bpf_autotest, test_bpf); -#ifdef RTE_HAS_LIBPCAP +#ifndef RTE_HAS_LIBPCAP + +static int +test_bpf_convert (void ) +{ +printf ("BPF not supported, skipping test\n" ); +return TEST_SKIPPED ; +} + +#else #include <pcap/pcap.h> static void
@@ -3462,5 +3471,6 @@ struct bpf_test { return rc; } -REGISTER_TEST_COMMAND (bpf_convert_autotest, test_bpf_convert);#endif /* RTE_HAS_LIBPCAP */ + +REGISTER_TEST_COMMAND (bpf_convert_autotest, test_bpf_convert);
Signature · 1 line
1.8.3.1
Quoted 31 lines
test_bpf_convertis being conditionally registered depending on the presence ofRTE_HAS_LIBPCAPexcept the UT unconditionally lists it as a test to run.when the UT runs
test_bpf_converttest-dpdk can't find the registration and assumes theDPDK_TESTenvironment 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_LIBPCAPprovide a stubtest_bpf_convertthat reports the test is skipped similar to that done with thetest_bpftest.Fixes 2eccf6afbea9 ("bpf: add function to convert classic BPF to DPDK BPF")Signed-off-by Tyler Retzlaff <[email protected]>--- app/test/test_bpf.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)app/test/test_bpf.c +0
-0
app/test/test_bpf.c struct bpf_test { · line 3272
Quoted 10 lines
app/test/test_bpf.c +6
-1@@ -3264,7 +3264,16 @@ struct bpf_test {REGISTER_TEST_COMMAND (bpf_autotest, test_bpf); -#ifdef RTE_HAS_LIBPCAP +#ifndef RTE_HAS_LIBPCAP + +static int +test_bpf_convert (void ) +{ +printf ("BPF not supported, skipping test\n" );
One nit: the message above seems a bit misleading... Probably "LIBPCAP is not supported" or so? With that fixed:
Quoted 17 lines
app/test/test_bpf.c +6
-2+return TEST_SKIPPED ; +} + +#else #include <pcap/pcap.h> static void@@ -3462,5 +3471,6 @@ struct bpf_test { return rc; } -REGISTER_TEST_COMMAND (bpf_convert_autotest, test_bpf_convert);#endif /* RTE_HAS_LIBPCAP */ + +REGISTER_TEST_COMMAND (bpf_convert_autotest, test_bpf_convert); --1.8.3.1
Quoted 26 lines · Konstantin
Quoted 12 lines
Signed-off-by Tyler Retzlaff <[email protected]>--- app/test/test_bpf.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)app/test/test_bpf.c +0
-0app/test/test_bpf.c struct bpf_test { · line 3272
Quoted 10 lines
app/test/test_bpf.c +6
-1@@ -3264,7 +3264,16 @@ struct bpf_test {REGISTER_TEST_COMMAND (bpf_autotest, test_bpf); -#ifdef RTE_HAS_LIBPCAP +#ifndef RTE_HAS_LIBPCAP + +static int +test_bpf_convert (void ) +{ +printf ("BPF not supported, skipping test\n" );One nit: the message above seems a bit misleading... Probably "LIBPCAP is not supported" or so? With that fixed:
Quoted 1 line
yeah, i cut and paste the other skip function. i agree i'll tweak the message to talk about libpcap.
Quoted 19 lines
Quoted 19 lines
app/test/test_bpf.c +6
-2+return TEST_SKIPPED ; +} + +#else #include <pcap/pcap.h> static void@@ -3462,5 +3471,6 @@ struct bpf_test { return rc; } -REGISTER_TEST_COMMAND (bpf_convert_autotest, test_bpf_convert);#endif /* RTE_HAS_LIBPCAP */ + +REGISTER_TEST_COMMAND (bpf_convert_autotest, test_bpf_convert); --1.8.3.1
Quoted 14 lines · On Mon, 21 Mar 2022 06:13:27 -0700 Tyler Retzlaff…
test_bpf_convertis being conditionally registered depending on the presence ofRTE_HAS_LIBPCAPexcept the UT unconditionally lists it as a test to run.when the UT runs
test_bpf_converttest-dpdk can't find the registration and assumes theDPDK_TESTenvironment 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_LIBPCAPprovide a stubtest_bpf_convertthat reports the test is skipped similar to that done with thetest_bpftest.
Quoted 6 lines
Fixes 2eccf6afbea9 ("bpf: add function to convert classic BPF to DPDK BPF")Signed-off-by Tyler Retzlaff <[email protected]>
LGTM
PATCH v2 1/1 test/bpf: skip test if libpcap is unavailable
In reply to Tyler Retzlafftest_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.
--- app/test/test_bpf.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
app/test/test_bpf.c +12 -2
@@ -3264,7 +3264,16 @@ struct bpf_test {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 @@ struct bpf_test { return rc; } -REGISTER_TEST_COMMAND (bpf_convert_autotest, test_bpf_convert);#endif /* RTE_HAS_LIBPCAP */ + +REGISTER_TEST_COMMAND (bpf_convert_autotest, test_bpf_convert);
Signature · 1 line
1.8.3.1
Quoted 47 lines
test_bpf_convertis being conditionally registered depending on the presence ofRTE_HAS_LIBPCAPexcept the UT unconditionally lists it as a test to run.when the UT runs
test_bpf_converttest-dpdk can't find the registration and assumes theDPDK_TESTenvironment 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_LIBPCAPprovide a stubtest_bpf_convertthat reports the test is skipped similar to that done with thetest_bpftest.Fixes 2eccf6afbea9 ("bpf: add function to convert classic BPF to DPDK BPF")Signed-off-by Tyler Retzlaff <[email protected]>--- app/test/test_bpf.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)app/test/test_bpf.c +10
-1@@ -3264,7 +3264,16 @@ struct bpf_test {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
app/test/test_bpf.c struct bpf_test {
Quoted 8 lines
app/test/test_bpf.c +2
-2@@ -3462,5 +3471,6 @@ struct bpf_test { return rc; } -REGISTER_TEST_COMMAND (bpf_convert_autotest, test_bpf_convert);#endif /* RTE_HAS_LIBPCAP */ + +REGISTER_TEST_COMMAND (bpf_convert_autotest, test_bpf_convert); --
Quoted 1 line
1.8.3.1
Quoted 2 lines · Konstantin
is there something more being requested here? the patch has been acked with no further comments for more than a month.
this patch is blocking enablement of the UT for on windows CI runs.
thanks.
Quoted 11 lines · Tyler Retzlaff
test_bpf_convertis being conditionally registered depending on the presence ofRTE_HAS_LIBPCAPexcept the UT unconditionally lists it as a test to run.when the UT runs
test_bpf_converttest-dpdk can't find the registration and assumes theDPDK_TESTenvironment 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.
Quoted 8 lines
* unconditionally register
test_bpf_convert
* if !RTE_HAS_LIBPCAPprovide a stubtest_bpf_convertthat reports the test is skipped similar to that done with thetest_bpftest.Fixes 2eccf6afbea9 ("bpf: add function to convert classic BPF to DPDK BPF")Signed-off-by Tyler Retzlaff <[email protected]>
Applied, thanks.
Signature · 1 line
David Marchand
Quoted 17 lines · David Marchand
Quoted 15 lines · Tyler Retzlaff
test_bpf_convertis being conditionally registered depending on the presence ofRTE_HAS_LIBPCAPexcept the UT unconditionally lists it as a test to run.when the UT runs
test_bpf_converttest-dpdk can't find the registration and assumes theDPDK_TESTenvironment 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_LIBPCAPprovide a stubtest_bpf_convertthat reports the test is skipped similar to that done with thetest_bpftest.
Quoted 8 lines
Quoted 4 lines
Fixes 2eccf6afbea9 ("bpf: add function to convert classic BPF to DPDK BPF")Signed-off-by Tyler Retzlaff <[email protected]>Applied, thanks.
thanks mate!
Quoted 4 lines
Signature · 2 lines
-- David Marchand