Commit 04572844 authored by Marc Hartmayer's avatar Marc Hartmayer Committed by Thomas Huth
Browse files

Use same test names in the default and the TAP13 output format



Use the same test names in the TAP13 output as in the default output
format. This makes the output more consistent. To achieve this, we
need to pass the test name as an argument to the function
`process_test_output`.

Before this change:
$ ./run_tests.sh
PASS selftest-setup (14 tests)
...

vs.

$ ./run_tests.sh -t
TAP version 13
ok 1 - selftest: true
ok 2 - selftest: argc == 3
...

After this change:
$ ./run_tests.sh
PASS selftest-setup (14 tests)
...

vs.

$ ./run_tests.sh -t
TAP version 13
ok 1 - selftest-setup: selftest: true
ok 2 - selftest-setup: selftest: argc == 3
...

While at it, introduce a local variable `kernel` in
`RUNTIME_log_stdout` since this makes the function easier to read.
Signed-off-by: default avatarMarc Hartmayer <mhartmay@linux.ibm.com>
Message-Id: <20200825102036.17232-3-mhartmay@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 99339834
......@@ -88,18 +88,19 @@ if [[ $tap_output == "no" ]]; then
postprocess_suite_output() { cat; }
else
process_test_output() {
local testname="$1"
CR=$'\r'
while read -r line; do
line="${line%$CR}"
case "${line:0:4}" in
PASS)
echo "ok TEST_NUMBER - ${line#??????}" >&3
echo "ok TEST_NUMBER - ${testname}: ${line#??????}" >&3
;;
FAIL)
echo "not ok TEST_NUMBER - ${line#??????}" >&3
echo "not ok TEST_NUMBER - ${testname}: ${line#??????}" >&3
;;
SKIP)
echo "ok TEST_NUMBER - ${line#??????} # skip" >&3
echo "ok TEST_NUMBER - ${testname}: ${line#??????} # skip" >&3
;;
*)
;;
......@@ -121,12 +122,14 @@ else
}
fi
RUNTIME_log_stderr () { process_test_output; }
RUNTIME_log_stderr () { process_test_output "$1"; }
RUNTIME_log_stdout () {
local testname="$1"
if [ "$PRETTY_PRINT_STACKS" = "yes" ]; then
./scripts/pretty_print_stacks.py $1 | process_test_output
local kernel="$2"
./scripts/pretty_print_stacks.py "$kernel" | process_test_output "$testname"
else
process_test_output
process_test_output "$testname"
fi
}
......
......@@ -140,10 +140,10 @@ function run()
# extra_params in the config file may contain backticks that need to be
# expanded, so use eval to start qemu. Use "> >(foo)" instead of a pipe to
# preserve the exit status.
summary=$(eval $cmdline 2> >(RUNTIME_log_stderr) \
> >(tee >(RUNTIME_log_stdout $kernel) | extract_summary))
summary=$(eval $cmdline 2> >(RUNTIME_log_stderr $testname) \
> >(tee >(RUNTIME_log_stdout $testname $kernel) | extract_summary))
ret=$?
[ "$STANDALONE" != "yes" ] && echo > >(RUNTIME_log_stdout $kernel)
[ "$STANDALONE" != "yes" ] && echo > >(RUNTIME_log_stdout $testname $kernel)
if [ $ret -eq 0 ]; then
print_result "PASS" $testname "$summary"
......
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