summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-22 19:44:02 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-22 19:45:29 +0100
commit7c24fc5496b3ad3128525e6287362e94ebb279c3 (patch)
treed1520e6263c03fc6cbfdb2adea18f01fd025b1ca /tests
parentfbfac7a743603c0114f0d810f396b442dad98d38 (diff)
Test suite: Propagate tmpbase into nested (setup) runs
This stops t-setup-import wrongly deciding we are in ADT non-shared mode. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rw-r--r--tests/lib3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/lib b/tests/lib
index fe8d8fc..3fe3ab0 100644
--- a/tests/lib
+++ b/tests/lib
@@ -42,6 +42,8 @@ if [ x"$tmp" = x ]; then
tmp=tests/tmp/$testname
rm -rf $tmp
mkdir $tmp
+elif [ "x$DGIT_TEST_TMPBASE" != x ]; then
+ tmpbase="$DGIT_TEST_TMPBASE"
fi
cd $tmp
@@ -925,6 +927,7 @@ t-chain-test () {
local d=${0%/*}
cd $root
export DGIT_TEST_TESTNAME="$testname"
+ export DGIT_TEST_TMPBASE="$tmpbase"
export ADTTMP=$tmp
exec "$d/$ct"
}