tests/xdp-trafficgen: Skip tests if probe fails for any reason

tohojo · tohojo · commit 317edcfc5e6f · 2025-08-14T19:31:26.000+02:00
The xdp-trafficgen tests were looking at particular return codes from
xdp-trafficgen; since the return code is not binary 1/0 depending on
probe results, just skip the tests if the probe fails for any reason.

Signed-off-by: Toke Høiland-Jørgensen &lt;toke@redhat.com&gt;
diff --git a/xdp-trafficgen/tests/test-xdp-trafficgen.sh b/xdp-trafficgen/tests/test-xdp-trafficgen.sh
@@ -6,13 +6,7 @@ PIDS=""
 
 skip_if_missing_kernel_support()
 {
-    $XDP_TRAFFICGEN probe
-    ret=$?
-    if [ "$ret" -eq "161" ]; then
-        exit $SKIPPED_TEST
-    elif [ "$ret" -ne "0" ]; then
-        exit 1
-    fi
+    $XDP_TRAFFICGEN probe || exit $SKIPPED_TEST
 }
 
 skip_if_missing_kernel_features()

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,7 @@ PIDS=""`
`6`	`6`
`7`	`7`	`skip_if_missing_kernel_support()`
`8`	`8`	`{`
`9`		`- $XDP_TRAFFICGEN probe`
`10`		`- ret=$?`
`11`		`- if [ "$ret" -eq "161" ]; then`
`12`		`- exit $SKIPPED_TEST`
`13`		`- elif [ "$ret" -ne "0" ]; then`
`14`		`- exit 1`
`15`		`- fi`
	`9`	`+ $XDP_TRAFFICGEN probe \|\| exit $SKIPPED_TEST`
`16`	`10`	`}`
`17`	`11`
`18`	`12`	`skip_if_missing_kernel_features()`