summaryrefslogtreecommitdiff
path: root/tests.merging
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-06-05 12:01:04 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-06-05 12:19:24 +0000
commite11b2f46217acf49b43d9d10817298cb6fdd90e0 (patch)
tree2e15f2e05fb2155ed74aa428836c635d975df2a1 /tests.merging
parent2c271b215fdcf43ff37c0acc06704cb2e03143d6 (diff)
downloadmorph-e11b2f46217acf49b43d9d10817298cb6fdd90e0.tar.gz
tests: don't put cachedir in the workspace
This was a wild idea when we first designed the branch structure. It causes more problems than it's worth as you may have multiple workspaces, and it needed to be set manually in the first place.
Diffstat (limited to 'tests.merging')
-rwxr-xr-xtests.merging/setup2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.merging/setup b/tests.merging/setup
index c18a5ac6..11fdf0f1 100755
--- a/tests.merging/setup
+++ b/tests.merging/setup
@@ -30,7 +30,7 @@ source "$SRCDIR/scripts/fix-committer-info"
cat <<EOF > "$DATADIR/morph.conf"
[config]
repo-alias = test=file://$DATADIR/%s#file://$DATADIR/%s
-cachedir = $DATADIR/workspace/.morph/cache
+cachedir = $DATADIR/cache
log = $DATADIR/morph.log
no-distcc = true
quiet = true