From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Apr 2012 01:32:36 +0000 (-0700)
Subject: Meta/Make: allow --noprove to decline use of prove in tests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=007cb03102c5e596bfce0f8e4d86d23eb41ff003;p=thirdparty%2Fgit.git

Meta/Make: allow --noprove to decline use of prove in tests
---

diff --git a/Make b/Make
index 794ae712fa..9ea81abbab 100755
--- 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"