diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-24 02:34:10 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 12:12:02 -0700 |
| commit | 07431fc8dc136573f31cb9db6605f49f792c8b10 (patch) | |
| tree | 70e7a6b4e8ce3dafdc1f260bc44abaec22f2d5fe | |
| parent | 7b905119703f480b1cf0791116b85a7e23aa3ba4 (diff) | |
| download | git-07431fc8dc136573f31cb9db6605f49f792c8b10.tar.gz git-07431fc8dc136573f31cb9db6605f49f792c8b10.tar.xz | |
tests: simplify "missing PREREQ" message
When a test has no prerequisites satisfied (the usual case), instead
of "missing THING of THING", just say "missing THING". This does not
affect the output when a test is skipped due to a missing
prerequisites if another prerequisite is satisfied.
For example: instead of
ok 8 # skip notes work (missing EXPENSIVE of EXPENSIVE)
ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE of USR_BIN_TIME,EXPENSIVE)
write
ok 8 # skip notes work (missing EXPENSIVE)
ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE of USR_BIN_TIME,EXPENSIVE)
Cc: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/test-lib.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 416713825..198dd860a 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -417,8 +417,14 @@ test_skip () { fi case "$to_skip" in t) + of_prereq= + if test "$missing_prereq" != "$prereq" + then + of_prereq=" of $prereq" + fi + say_color skip >&3 "skipping test: $@" - say_color skip "ok $test_count # skip $1 (missing $missing_prereq of $prereq)" + say_color skip "ok $test_count # skip $1 (missing $missing_prereq${of_prereq})" : true ;; *) |