aboutsummaryrefslogtreecommitdiff
path: root/tools/testing/selftests/kselftest
diff options
context:
space:
mode:
authorKees Cook2019-04-24 16:12:33 -0700
committerShuah Khan2019-04-25 13:14:45 -0600
commitb0df366bbd701c45e93af0dcb87ce22398589d1d (patch)
tree2252902b213c65b178d6a37a17ca0aaa568d9bf2 /tools/testing/selftests/kselftest
parentbf66078235ca27062f5924ed6901f40becc4a1a4 (diff)
selftests: Add plan line and fix result line syntax
The TAP version 13 spec requires a "plan" line, which has been missing. Since we always know how many tests we're going to run, emit the count on the plan line. This also fixes the result lines to remove the "1.." prefix which is against spec, and to mark skips with the correct "# SKIP" suffix. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/kselftest')
-rw-r--r--tools/testing/selftests/kselftest/runner.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/testing/selftests/kselftest/runner.sh b/tools/testing/selftests/kselftest/runner.sh
index f12b0a631273..e0621974e01e 100644
--- a/tools/testing/selftests/kselftest/runner.sh
+++ b/tools/testing/selftests/kselftest/runner.sh
@@ -20,15 +20,15 @@ run_one()
echo "========================================"
if [ ! -x "$TEST" ]; then
echo "$TEST_HDR_MSG: Warning: file $TEST is not executable, correct this."
- echo "not ok 1..$test_num $TEST_HDR_MSG [FAIL]"
+ echo "not ok $test_num $TEST_HDR_MSG"
else
cd `dirname $TEST` > /dev/null
(./$BASENAME_TEST >> "$logfile" 2>&1 &&
- echo "ok 1..$test_num $TEST_HDR_MSG [PASS]") ||
+ echo "ok $test_num $TEST_HDR_MSG") ||
(if [ $? -eq $skip_rc ]; then \
- echo "not ok 1..$test_num $TEST_HDR_MSG [SKIP]"
+ echo "not ok $test_num $TEST_HDR_MSG # SKIP"
else
- echo "not ok 1..$test_num $TEST_HDR_MSG [FAIL]"
+ echo "not ok $test_num $TEST_HDR_MSG"
fi)
cd - >/dev/null
fi
@@ -39,6 +39,8 @@ run_many()
echo "TAP version 13"
DIR=$(basename "$PWD")
test_num=0
+ total=$(echo "$@" | wc -w)
+ echo "1..$total"
for TEST in "$@"; do
BASENAME_TEST=$(basename $TEST)
test_num=$(( test_num + 1 ))