]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Make: allow passing prove options from outside environment
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2016 23:22:05 +0000 (15:22 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2016 23:22:05 +0000 (15:22 -0800)
Make

diff --git a/Make b/Make
index e746c76fbfa49b408443954de8a692e52b43bba2..59bf91127d6e6c6dd6ba50bb9a4034eb956f1639 100755 (executable)
--- 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