Tests: Introduce t-set-using-tmp and use it in lib and adhoc

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 3c31a29cb11ff689128bb791d563002cf48f9bd3..357bb8613597808f9d955545a72d1e7448bed965 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -24,14 +24,14 @@ fi
 cd $tmp
 
 tmp=`pwd`
 cd $tmp
 
 tmp=`pwd`

-export HOME=$tmp
-export DGIT_TEST_DUMMY_DIR=$tmp
+
+t-set-using-tmp
+

 ln -f $troot/ssh ssh
 
 mkdir -p $tmp/gnupg
 cp $troot/gnupg/* $tmp/gnupg
 chmod go-rw $tmp/gnupg/*
 ln -f $troot/ssh ssh
 
 mkdir -p $tmp/gnupg
 cp $troot/gnupg/* $tmp/gnupg
 chmod go-rw $tmp/gnupg/*

-export GNUPGHOME=$tmp/gnupg

 
 mkdir -p $tmp/incoming
 cat <<END >$tmp/dput.cf
 
 mkdir -p $tmp/incoming
 cat <<END >$tmp/dput.cf


@@ -343,7 +343,6 @@ t-git-config () {
 
 t-drs () {
        export DGIT_TEST_TROOT=$troot
 
 t-drs () {
        export DGIT_TEST_TROOT=$troot

-       export DGIT_TEST_TMP=$tmp

  t-git-config dgit-distro.test-dummy.git-url "ext::$troot/drs-git-ext %S "
  t-git-config dgit-distro.test-dummy.git-check true
  t-git-config dgit-distro.test-dummy.git-create true
  t-git-config dgit-distro.test-dummy.git-url "ext::$troot/drs-git-ext %S "
  t-git-config dgit-distro.test-dummy.git-check true
  t-git-config dgit-distro.test-dummy.git-create true