test-lib: show missing prereq summary

When running the full test suite many tests can be skipped because of
missing prerequisites. It not easy right now to get an overview of which
ones are missing.
When switching to a new machine or environment some libraries and tools
might be missing or maybe a dependency broke completely. In this case
the tests would indicate nothing since all dependant tests are simply
skipped. This could hide broken behaviour or missing features in the
build. Therefore this patch summarizes the missing prereqs at the end of
the test run making it easier to spot such cases.

 - Add failed prereqs to the test results.
 - Aggregate and then show them with the totals.

Signed-off-by: Fabian Stelzer <fs@gigacodes.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/aggregate-results.sh b/t/aggregate-results.sh
index 7913e206ed6b73d16779e91d6a9197e602626c57..7f2b83bdc8181f6d653f40bf99a40bf8e7cc03f5 100755 (executable)
--- a/t/aggregate-results.sh
+++ b/t/aggregate-results.sh
@@ -6,6 +6,7 @@ success=0
 failed=0
 broken=0
 total=0
+missing_prereq=
 
 while read file
 do
@@ -30,10 +31,26 @@ do
                        broken=$(($broken + $value)) ;;
                total)
                        total=$(($total + $value)) ;;
+               missing_prereq)
+                       missing_prereq="$missing_prereq,$value" ;;
                esac
        done <"$file"
 done
 
+if test -n "$missing_prereq"
+then
+       unique_missing_prereq=$(
+               echo $missing_prereq |
+               tr -s "," "\n" |
+               grep -v '^$' |
+               sort -u |
+               paste -s -d ' ')
+       if test -n "$unique_missing_prereq"
+       then
+               printf "\nmissing prereq: $unique_missing_prereq\n\n"
+       fi
+fi
+
 if test -n "$failed_tests"
 then
        printf "\nfailed test(s):$failed_tests\n\n"

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 2679a7596a610bca1a884be085dead4229962270..f61da562f6265e39375aa649c04f334d71020188 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -669,6 +669,8 @@ test_fixed=0
 test_broken=0
 test_success=0
 
+test_missing_prereq=
+
 test_external_has_tap=0
 
 die () {
@@ -1069,6 +1071,14 @@ test_skip () {
                        of_prereq=" of $test_prereq"
                fi
                skipped_reason="missing $missing_prereq${of_prereq}"
+
+               # Keep a list of all the missing prereq for result aggregation
+               if test -z "$missing_prereq"
+               then
+                       test_missing_prereq=$missing_prereq
+               else
+                       test_missing_prereq="$test_missing_prereq,$missing_prereq"
+               fi
        fi
 
        case "$to_skip" in
@@ -1175,6 +1185,7 @@ test_done () {
                fixed $test_fixed
                broken $test_broken
                failed $test_failure
+               missing_prereq $test_missing_prereq
 
                EOF
        fi