]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Dothem: tell Meta/Make to test in the ramdisk
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jun 2015 21:25:55 +0000 (14:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jun 2015 21:25:55 +0000 (14:25 -0700)
Dothem

diff --git a/Dothem b/Dothem
index 7405c8747076d709d2858b4eb92a3f4b1d250ac1..14988d485990d6dc93fd500218f2b18a00693a1c 100755 (executable)
--- a/Dothem
+++ b/Dothem
@@ -39,20 +39,7 @@ do
        shift
 done
 
-for TRASH in /dev/shm /tmp ""
-do
-       if test -n "$TRASH" &&
-          mkdir -p "$TRASH/testpen" 2>/dev/null &&
-          test -w "$TRASH/testpen"
-       then
-               TRASH="--root=$(cd "$TRASH/testpen" && /bin/pwd)"
-               break
-       fi
-done
-
 sh -c 'asciidoc --version >/dev/null 2>&1' || nodoc=y
-GIT_TEST_OPTS="$TRASH${GIT_TEST_OPTS+" $GIT_TEST_OPTS"}"
-export GIT_TEST_OPTS
 
 GIT_TEST_CHAIN_LINT=1
 export GIT_TEST_CHAIN_LINT
@@ -201,7 +188,8 @@ do
 
                save=$(git rev-parse HEAD) &&
 
-               Meta/Make $M ${test+"$test"} $jobs -- ${with_dash:+SHELL_PATH=/bin/dash} "$@" $dotest &&
+               Meta/Make $M ${test+"$test"} $jobs --memtrash \
+                   -- ${with_dash:+SHELL_PATH=/bin/dash} "$@" $dotest &&
 
                {
                        test -n "$skip_doc" ||