summaryrefslogtreecommitdiff
path: root/yarns
diff options
context:
space:
mode:
authorMike Williams <mike.williams@codethink.co.uk>2015-06-11 12:59:50 +0000
committerBaserock Gerrit <gerrit@baserock.org>2015-09-17 15:01:52 +0000
commit519a6460930c5ae08a9591035f72e88fd4db9b71 (patch)
tree27f12a4f8b0b1cbe0a82fc3cbb2a86cc33777d5e /yarns
parent07df32fbd57477e5808cdbace965edcd0a81348f (diff)
downloadmorph-519a6460930c5ae08a9591035f72e88fd4db9b71.tar.gz
Force test suite to observe morph.conf tempdir
This change, suggested in story #16, causes the testing suite to use the user-defined tempdir in /etc/morph.conf if it exists or continue using /tmp if not. This will prevent the test suite from filling drives that are not intended to be used for development work. Change-Id: I94edabe4ea1eca7a55ece7424ece7bbd4b68c513
Diffstat (limited to 'yarns')
-rw-r--r--yarns/implementations.yarn4
1 files changed, 2 insertions, 2 deletions
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index 3bef0374..ae9c2fae 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -411,14 +411,14 @@ another to hold a chunk.
[config]
repo-alias = test=git://127.0.0.1:$GIT_DAEMON_PORT/%s#git://127.0.0.1:$GIT_DAEMON_PORT/%s
cachedir = $DATADIR/cache
- tempdir = $DATADIR/tmp
+ tempdir = $TMPDIR
trove-host = 127.0.0.1
trove-id = testtrove
build-ref-prefix = testtrove/builds
EOF
mkdir "$DATADIR/cache"
- mkdir "$DATADIR/tmp"
+ mkdir -p "$TMPDIR"
Some resources are cleaned up by yarn, forked processes aren't one of
these, so need to shut down the git daemon after we finish.