]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Make: allow --noprove to decline use of prove in tests
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Apr 2012 01:32:36 +0000 (18:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Apr 2012 01:32:55 +0000 (18:32 -0700)
Make

diff --git a/Make b/Make
index 794ae712fa38660932e60fbee83c697c5c7364c2..9ea81abbab955ea347f11430a8e091be770e45f2 100755 (executable)
--- a/Make
+++ b/Make
@@ -56,7 +56,7 @@ do
        )
 done
 
-Wall='-Wall -Wdeclaration-after-statement' tests= jobs= skip=
+Wall='-Wall -Wdeclaration-after-statement' tests= jobs= skip= oldtest=
 case `uname` in
 OpenBSD)
        NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
@@ -101,6 +101,9 @@ do
                '')     jobs=$1 ;;
                esac
                ;;
+       -noprove | --noprove)
+               oldtest=t
+               ;;
        -loose | --loose)
                Wall=
                ;;
@@ -135,7 +138,8 @@ if test -z "$tests" && test -n "$skip"
 then
        : GIT_SKIP_TESTS="${GIT_SKIP_TESTS:-$skip}"
 fi
-if sh -c 'prove --version >/dev/null 2>&1' &&
+if test -z "$oldtest" &&
+   sh -c 'prove --version >/dev/null 2>&1' &&
    sh -c 'prove --exec : >/dev/null 2>&1'
 then
         DEFAULT_TEST_TARGET=prove GIT_PROVE_OPTS="$jobs"