@@ -12,6 +12,8 @@ rc_test=0
if [ "$rc_test" -eq 0 ] ; then
echo "$rc_test" > "$NFT_TEST_TESTTMPDIR/rc_test-ok"
+elif [ "$rc_test" -eq 77 ] ; then
+ echo "$rc_test" > "$NFT_TEST_TESTTMPDIR/rc_test-skipped"
else
echo "$rc_test" > "$NFT_TEST_TESTTMPDIR/rc_test-failed"
fi
@@ -271,6 +271,7 @@ fi
echo ""
ok=0
+skipped=0
failed=0
taint=0
@@ -366,6 +367,14 @@ for testfile in "${TESTS[@]}" ; do
msg_warn "[DUMP FAIL] $testfile"
fi
fi
+ elif [ "$rc_got" -eq 77 ] ; then
+ ((skipped++))
+ if [ "$VERBOSE" == "y" ] ; then
+ msg_warn "[SKIPPED] $testfile"
+ [ ! -z "$test_output" ] && echo "$test_output"
+ else
+ msg_warn "[SKIPPED] $testfile"
+ fi
else
((failed++))
if [ "$VERBOSE" == "y" ] ; then
@@ -390,7 +399,7 @@ echo ""
kmemleak_found=0
check_kmemleak_force
-msg_info "results: [OK] $ok [FAILED] $failed [TOTAL] $((ok+failed))"
+msg_info "results: [OK] $ok [SKIPPED] $skipped [FAILED] $failed [TOTAL] $((ok+skipped+failed))"
kernel_cleanup
Allow scripts to indicate that a test could not run by exiting 77. "77" is chosen as exit code from automake's testsuites ([1]). Compare to git-bisect which chooses 125 to indicate skipped. [1] https://www.gnu.org/software/automake/manual/html_node/Scripts_002dbased-Testsuites.html Signed-off-by: Thomas Haller <thaller@redhat.com> --- tests/shell/helpers/test-wrapper.sh | 2 ++ tests/shell/run-tests.sh | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-)