Commit b0df366b authored by Kees Cook's avatar Kees Cook Committed by Shuah Khan

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: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent bf660782
......@@ -111,7 +111,7 @@ static inline void ksft_test_result_skip(const char *msg, ...)
ksft_cnt.ksft_xskip++;
va_start(args, msg);
printf("ok %d # skip ", ksft_test_num());
printf("not ok %d # SKIP ", ksft_test_num());
vprintf(msg, args);
va_end(args);
}
......@@ -172,7 +172,7 @@ static inline int ksft_exit_skip(const char *msg, ...)
va_list args;
va_start(args, msg);
printf("1..%d # Skipped: ", ksft_test_num());
printf("not ok %d # SKIP ", ksft_test_num());
vprintf(msg, args);
va_end(args);
} else {
......
......@@ -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 ))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment