diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-09-08 16:26:02 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-09-09 16:35:12 +0200 |
| commit | 5004259496fb2785a95dad3e6d2384c886fcec0a (patch) | |
| tree | 5aa20cde80f718ce44e8d359b39499a0822b3e9d /tests/shell/run-tests.sh | |
| parent | 01b63ac8c2f4d421ecfa62dc8e6403015a7ea34a (diff) | |
tests/shell: print number of completed tests to show progress
Especially with VALGRIND=y, a full test run can take a long time. When
looking at the output, it's interesting to get a feel how far along we
are.
Print the number of completed jobs vs. the number of total jobs, in the
line showing the test result. It gives a nice progress status.
Example:
I: [OK] 1/373 ./tests/shell/testcases/bitwise/0040mark_binop_1
I: [OK] 2/373 ./tests/shell/testcases/bitwise/0040mark_binop_0
...
Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/shell/run-tests.sh')
| -rwxr-xr-x | tests/shell/run-tests.sh | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tests/shell/run-tests.sh b/tests/shell/run-tests.sh index 5931b20e..d57108c0 100755 --- a/tests/shell/run-tests.sh +++ b/tests/shell/run-tests.sh @@ -511,19 +511,24 @@ fi print_test_header() { local msglevel="$1" local testfile="$2" - local status="$3" - local suffix="$4" + local testidx_completed="$3" + local status="$4" + local suffix="$5" local text + local s_idx + + s_idx="${#TESTS[@]}" + align_text text right "${#s_idx}" "$testidx_completed" + s_idx="$text/${#TESTS[@]}" align_text text left 12 "[$status]" - _msg "$msglevel" "$text $testfile${suffix:+: $suffix}" + _msg "$msglevel" "$text $s_idx $testfile${suffix:+: $suffix}" } print_test_result() { local NFT_TEST_TESTTMPDIR="$1" local testfile="$2" local rc_got="$3" - shift 3 local result_msg_level="I" local result_msg_suffix="" @@ -553,7 +558,7 @@ print_test_result() { result_msg_files=( "$NFT_TEST_TESTTMPDIR/testout.log" ) fi - print_test_header "$result_msg_level" "$testfile" "$result_msg_status" "$result_msg_suffix" + print_test_header "$result_msg_level" "$testfile" "$((ok + skipped + failed))" "$result_msg_status" "$result_msg_suffix" if [ "$VERBOSE" = "y" ] ; then local f @@ -575,9 +580,10 @@ declare -A JOBS_PIDLIST job_start() { local testfile="$1" + local testidx="$2" if [ "$NFT_TEST_JOBS" -le 1 ] ; then - print_test_header I "$testfile" "EXECUTING" "" + print_test_header I "$testfile" "$testidx" "EXECUTING" "" fi NFT_TEST_TESTTMPDIR="${JOBS_TEMPDIR["$testfile"]}" \ @@ -619,7 +625,7 @@ for testfile in "${TESTS[@]}" ; do chmod 755 "$NFT_TEST_TESTTMPDIR" JOBS_TEMPDIR["$testfile"]="$NFT_TEST_TESTTMPDIR" - job_start "$testfile" & + job_start "$testfile" "$TESTIDX" & JOBS_PIDLIST[$!]="$testfile" ((JOBS_N_RUNNING++)) done |