mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: simplify "missing PREREQ" message

Browse Source 
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>
This commit is contained in:
Jonathan Nieder
2010-08-24 02:34:10 -05:00
committed by Junio C Hamano
parent 7b90511970
commit 07431fc8dc
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/test-lib.sh
View File

@ -417,8 +417,14 @@ test_skip () {
fi fi
case "$to_skip" in case "$to_skip" in
t) t)
of_prereq=
if test "$missing_prereq" != "$prereq"
then
of_prereq=" of $prereq"
fi
say_color skip >&3 "skipping test: $@" 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 : true
;; ;;
*) *)