@matheusbsbs / matheus-bagliano / commits / 07431fc8dc
Fork 0

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>

Jonathan Nieder committed Aug 24, 2010 at 02:34 UTC 07431fc8dc136573f31cb9db6605f49f792c8b10
1 file changed +7 -1
t/test-lib.sh
+7 -1
@@ -417,8 +417,14 @@ test_skip () {
417 fi
418 case "$to_skip" in
419 t)
420 + of_prereq=
421 + if test "$missing_prereq" != "$prereq"
422 + then
423 + of_prereq=" of $prereq"
424 + fi
425 +
426 say_color skip >&3 "skipping test: $@"
421 - say_color skip "ok $test_count # skip $1 (missing $missing_prereq of $prereq)"
427 + say_color skip "ok $test_count # skip $1 (missing $missing_prereq${of_prereq})"
428 : true
429 ;;
430 *)