Skipping lazy prereq for test cases that are skipped via the --run option or via GIT_SKIP_TESTS. Issue 353: https://github.com/gitgitgadget/git/issues/353 Signed-off-by: Gopal Yadav <gopunop@xxxxxxxxx> --- t/test-lib-functions.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 6a8e194a99..bac86ffd9d 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -578,10 +578,10 @@ test_expect_failure () { test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq= test "$#" = 2 || BUG "not 2 or 3 parameters to test-expect-failure" - test_verify_prereq - export test_prereq if ! test_skip "$@" then + test_verify_prereq + export test_prereq say >&3 "checking known breakage of $TEST_NUMBER.$test_count '$1': $2" if test_run_ "$2" expecting_failure then @@ -598,10 +598,10 @@ test_expect_success () { test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq= test "$#" = 2 || BUG "not 2 or 3 parameters to test-expect-success" - test_verify_prereq - export test_prereq if ! test_skip "$@" then + test_verify_prereq + export test_prereq say >&3 "expecting success of $TEST_NUMBER.$test_count '$1': $2" if test_run_ "$2" then @@ -627,10 +627,10 @@ test_external () { BUG "not 3 or 4 parameters to test_external" descr="$1" shift - test_verify_prereq - export test_prereq if ! test_skip "$descr" "$@" then + test_verify_prereq + export test_prereq # Announce the script to reduce confusion about the # test output that follows. say_color "" "# run $test_count: $descr ($*)" -- 2.20.1
