From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Dec 2016 23:21:20 +0000 (-0800)
Subject: Meta/Make: pass --no-prove and --long down thru Dothem to Make
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4ebbfcb6eaa336c1ddf996725bbbe97193dc298;p=thirdparty%2Fgit.git

Meta/Make: pass --no-prove and --long down thru Dothem to Make
---

diff --git a/Dothem b/Dothem
index 8dca9ce947..c5d4c387ff 100755
--- a/Dothem
+++ b/Dothem
@@ -16,12 +16,13 @@ inst_prefix=$(
 	echo $HOME
 )
 
-force= with_dash= M= install= nodoc= notest= bootstrap= branches= jobs=
-scratch=
+force= with_dash= test_long= M= install= nodoc= notest= bootstrap= branches= jobs=
+scratch= noprove=
 while	case "$1" in
 	--pedantic | --locale=* | --loose) M="$M $1" ;;
 	--force) force=$1 ;;
 	--dash) with_dash=y ;;
+	--long) test_long=--long ;;
 	--noinstall) install=noinstall ;;
 	--nodoc) nodoc=y ;;
 	--notest) notest=y ;;
@@ -30,6 +31,7 @@ while	case "$1" in
 	--bootstrap) bootstrap=y ;;
 	--base=*) BUILDBASE=${1#*=} ;;
 	--branches=*) branches=${1#*=} ;;
+	--noprove) noprove=$1 ;;
 	-j*) jobs=$1 ;;
 	--) shift; break ;;
 	-*) echo >&2 "Unknown option: $1"; exit 1 ;;
@@ -194,7 +196,7 @@ do
 
 		save=$(git rev-parse HEAD) &&
 
-		Meta/Make $M ${test+"$test"} $jobs --memtrash \
+		Meta/Make $M $noprove ${test+"$test"} $jobs $test_long --memtrash \
 		    -- ${with_dash:+SHELL_PATH=/bin/dash} "$@" $dotest &&
 
 		{
diff --git a/Make b/Make
index 0e422e2032..3ea1d24bdb 100755
--- a/Make
+++ b/Make
@@ -149,6 +149,10 @@ do
 			done | tr '\012' ' '
 		)
 		;;
+	--long)
+		GIT_TEST_LONG=YesPlease
+		export GIT_TEST_LONG
+		;;
 	--dash)
 		with_dash=y
 		;;