From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Jul 2015 22:26:01 +0000 (-0700)
Subject: Meta/Make: clean --memtrash testpen after a successful run
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a55cb8eecd4e234e606e5a44b8c9aec1985b6017;p=thirdparty%2Fgit.git

Meta/Make: clean --memtrash testpen after a successful run
---

diff --git a/Make b/Make
index fbdc6bfd9b..1ba20fe4c6 100755
--- a/Make
+++ b/Make
@@ -56,7 +56,8 @@ do
 done
 
 Wall="-Wall -Wvla -Wdeclaration-after-statement -Wno-format-zero-length${Wall+ $Wall}"
-tests= jobs= skip= oldtest= with_dash=
+tests= jobs= skip= oldtest= with_dash= testpen=
+clean=:
 
 case `uname` in
 OpenBSD)
@@ -111,7 +112,6 @@ case "$NO_PEDANTIC" in
 	;;
 esac
 
-testpen=
 while case $# in 0) break ;; esac
 do 
 	case "$1" in
@@ -174,7 +174,9 @@ then
 		   mkdir -p "$TRASH/$testpen" 2>/dev/null &&
 		   test -w "$TRASH/$testpen"
 		then
-			TRASH="--root=$(cd "$TRASH/$testpen" && /bin/pwd)"
+			testpen=$(cd "$TRASH/$testpen" && /bin/pwd)
+			TRASH="--root=$testpen"
+			clean="$clean; rmdir '$testpen'"
 			break
 		fi
 	done
@@ -216,6 +218,7 @@ snap)
 	prefix="$inst_prefix/git-test" ;;
 esac
 
+clean="$clean; rm -f version"
 determine_long_version >version
 
 set "prefix=$prefix" "$@"
@@ -267,5 +270,5 @@ ${make-make} \
      ${tests:+"T=$tests"} \
      "$@"
 status=$?
-rm -f version
+eval "$clean"
 exit $status