Meta/Make: clean --memtrash testpen after a successful run
Junio C Hamano committed
Jul 10, 2015 at 15:26 UTC
a55cb8eecd4e234e606e5a44b8c9aec1985b6017
1 file changed
+7
-4
Make
+7
-4
@@ -56,7 +56,8 @@ do
56
done
57
58
Wall="-Wall -Wvla -Wdeclaration-after-statement -Wno-format-zero-length${Wall+ $Wall}"
59
-tests= jobs= skip= oldtest= with_dash=
59
+tests= jobs= skip= oldtest= with_dash= testpen=
60
+clean=:
61
62
case `uname` in
63
OpenBSD)
@@ -111,7 +112,6 @@ case "$NO_PEDANTIC" in
112
;;
113
esac
114
114
-testpen=
115
while case $# in 0) break ;; esac
116
do
117
case "$1" in
@@ -174,7 +174,9 @@ then
174
mkdir -p "$TRASH/$testpen" 2>/dev/null &&
175
test -w "$TRASH/$testpen"
176
then
177
- TRASH="--root=$(cd "$TRASH/$testpen" && /bin/pwd)"
177
+ testpen=$(cd "$TRASH/$testpen" && /bin/pwd)
178
+ TRASH="--root=$testpen"
179
+ clean="$clean; rmdir '$testpen'"
180
break
181
fi
182
done
@@ -216,6 +218,7 @@ snap)
218
prefix="$inst_prefix/git-test" ;;
219
esac
220
221
+clean="$clean; rm -f version"
222
determine_long_version >version
223
224
set "prefix=$prefix" "$@"
@@ -267,5 +270,5 @@ ${make-make} \
270
${tests:+"T=$tests"} \
271
"$@"
272
status=$?
270
-rm -f version
273
+eval "$clean"
274
exit $status