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

test-lib: allow test code to check the list of declared prerequisites

Browse Source 
This is plumbing to prepare helpers like test_terminal to notice buggy
test scripts that do not declare all of the necessary prerequisites.

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-10-17 02:36:58 +08:00
committed by Junio C Hamano
parent e23f436c35
commit 05236a5e9d
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
t/test-lib.sh
View File

@ -362,6 +362,15 @@ test_have_prereq () {
test $total_prereq = $ok_prereq test $total_prereq = $ok_prereq
} }
test_declared_prereq () {
case ",$test_prereq," in
*,$1,*)
return 0
;;
esac
return 1
}
# You are not expected to call test_ok_ and test_failure_ directly, use # You are not expected to call test_ok_ and test_failure_ directly, use
# the text_expect_* functions instead. # the text_expect_* functions instead.
@ -414,17 +423,17 @@ test_skip () {
break break
esac esac
done done
if test -z "$to_skip" && test -n "$prereq" && if test -z "$to_skip" && test -n "$test_prereq" &&
! test_have_prereq "$prereq" ! test_have_prereq "$test_prereq"
then then
to_skip=t to_skip=t
fi fi
case "$to_skip" in case "$to_skip" in
t) t)
of_prereq= of_prereq=
if test "$missing_prereq" != "$prereq" if test "$missing_prereq" != "$test_prereq"
then then
of_prereq=" of $prereq" of_prereq=" of $test_prereq"
fi fi
say_color skip >&3 "skipping test: $@" say_color skip >&3 "skipping test: $@"
@ -438,9 +447,10 @@ test_skip () {
} }
test_expect_failure () { test_expect_failure () {
test "$#" = 3 && { prereq=$1; shift; } || prereq= test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
test "$#" = 2 || test "$#" = 2 ||
error "bug in the test script: not 2 or 3 parameters to test-expect-failure" error "bug in the test script: not 2 or 3 parameters to test-expect-failure"
export test_prereq
if ! test_skip "$@" if ! test_skip "$@"
then then
say >&3 "checking known breakage: $2" say >&3 "checking known breakage: $2"
@ -456,9 +466,10 @@ test_expect_failure () {
} }
test_expect_success () { test_expect_success () {
test "$#" = 3 && { prereq=$1; shift; } || prereq= test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
test "$#" = 2 || test "$#" = 2 ||
error "bug in the test script: not 2 or 3 parameters to test-expect-success" error "bug in the test script: not 2 or 3 parameters to test-expect-success"
export test_prereq
if ! test_skip "$@" if ! test_skip "$@"
then then
say >&3 "expecting success: $2" say >&3 "expecting success: $2"
@ -500,11 +511,12 @@ test_expect_code () {
# Usage: test_external description command arguments... # Usage: test_external description command arguments...
# Example: test_external 'Perl API' perl ../path/to/test.pl # Example: test_external 'Perl API' perl ../path/to/test.pl
test_external () { test_external () {
test "$#" = 4 && { prereq=$1; shift; } || prereq= test "$#" = 4 && { test_prereq=$1; shift; } || test_prereq=
test "$#" = 3 || test "$#" = 3 ||
error >&5 "bug in the test script: not 3 or 4 parameters to test_external" error >&5 "bug in the test script: not 3 or 4 parameters to test_external"
descr="$1" descr="$1"
shift shift
export test_prereq
if ! test_skip "$descr" "$@" if ! test_skip "$descr" "$@"
then then
# Announce the script to reduce confusion about the # Announce the script to reduce confusion about the