From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Jan 2016 23:22:05 +0000 (-0800)
Subject: Meta/Make: allow passing prove options from outside environment
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=232e2967201c0a8e4b36f14681bcd32d0bb95bd6;p=thirdparty%2Fgit.git

Meta/Make: allow passing prove options from outside environment
---

diff --git a/Make b/Make
index e746c76fbf..59bf91127d 100755
--- a/Make
+++ b/Make
@@ -199,8 +199,9 @@ if test -z "$oldtest" &&
    sh -c 'prove --exec : >/dev/null 2>&1'
 then
 	# --state=slow,save
-        DEFAULT_TEST_TARGET=prove GIT_PROVE_OPTS="--timer $jobs"
-        export DEFAULT_TEST_TARGET GIT_PROVE_OPTS
+	DEFAULT_TEST_TARGET=prove
+	GIT_PROVE_OPTS="${GIT_PROVE_OPTS:+$GIT_PROVE_OPTS }--timer $jobs"
+	export DEFAULT_TEST_TARGET GIT_PROVE_OPTS
 fi
 
 LC_ALL=$LANG