diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-06-05 12:01:04 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-06-05 12:19:24 +0000 |
| commit | e11b2f46217acf49b43d9d10817298cb6fdd90e0 (patch) | |
| tree | 2e15f2e05fb2155ed74aa428836c635d975df2a1 /tests.branching | |
| parent | 2c271b215fdcf43ff37c0acc06704cb2e03143d6 (diff) | |
| download | morph-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.branching')
7 files changed, 1 insertions, 21 deletions
diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout index d80f81d7..af65eb7b 100644 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout @@ -1,8 +1,6 @@ File tree: d . d ./.morph -d ./.morph/cache -d ./.morph/cache/gits d ./newbranch d ./newbranch/.morph-system-branch d ./newbranch/test:morphs diff --git a/tests.branching/branch-creates-new-system-branch.stdout b/tests.branching/branch-creates-new-system-branch.stdout index 7c6b3065..ba1651e5 100644 --- a/tests.branching/branch-creates-new-system-branch.stdout +++ b/tests.branching/branch-creates-new-system-branch.stdout @@ -1,8 +1,6 @@ File tree: d . d ./.morph -d ./.morph/cache -d ./.morph/cache/gits d ./newbranch d ./newbranch/.morph-system-branch d ./newbranch/test:morphs diff --git a/tests.branching/branch-works-anywhere.stdout b/tests.branching/branch-works-anywhere.stdout index 41f30440..0b59ce71 100644 --- a/tests.branching/branch-works-anywhere.stdout +++ b/tests.branching/branch-works-anywhere.stdout @@ -1,8 +1,6 @@ Workspace after creating the first branch: d . d ./.morph -d ./.morph/cache -d ./.morph/cache/gits d ./branch1 d ./branch1/.morph-system-branch d ./branch1/test:morphs @@ -13,8 +11,6 @@ f ./branch1/test:morphs/hello-system.morph Workspace after creating the second branch: d . d ./.morph -d ./.morph/cache -d ./.morph/cache/gits d ./branch1 d ./branch1/.morph-system-branch d ./branch1/test:morphs @@ -32,8 +28,6 @@ f ./branch2/test:morphs/hello-system.morph Workspace after creating the third branch: d . d ./.morph -d ./.morph/cache -d ./.morph/cache/gits d ./branch1 d ./branch1/.morph-system-branch d ./branch1/test:morphs @@ -58,8 +52,6 @@ f ./branch3/test:morphs/hello-system.morph Workspace after creating the fourth branch: d . d ./.morph -d ./.morph/cache -d ./.morph/cache/gits d ./branch1 d ./branch1/.morph-system-branch d ./branch1/test:morphs diff --git a/tests.branching/checkout-existing-branch.stdout b/tests.branching/checkout-existing-branch.stdout index 50bd01ab..0f51893a 100644 --- a/tests.branching/checkout-existing-branch.stdout +++ b/tests.branching/checkout-existing-branch.stdout @@ -1,8 +1,6 @@ File tree: d . d ./.morph -d ./.morph/cache -d ./.morph/cache/gits d ./master d ./master/.morph-system-branch d ./master/test:morphs diff --git a/tests.branching/checkout-works-anywhere.stdout b/tests.branching/checkout-works-anywhere.stdout index 15ae3686..ba83058f 100644 --- a/tests.branching/checkout-works-anywhere.stdout +++ b/tests.branching/checkout-works-anywhere.stdout @@ -1,8 +1,6 @@ Workspace after checking out master from the workspace directory: d . d ./.morph -d ./.morph/cache -d ./.morph/cache/gits d ./master d ./master/.morph-system-branch d ./master/test:morphs @@ -13,8 +11,6 @@ f ./master/test:morphs/hello-system.morph Workspace after checking out master from within a new branch: d . d ./.morph -d ./.morph/cache -d ./.morph/cache/gits d ./master d ./master/.morph-system-branch d ./master/test:morphs diff --git a/tests.branching/edit-works-after-branch-root-was-renamed.stdout b/tests.branching/edit-works-after-branch-root-was-renamed.stdout index 1436414d..f15fe30a 100644 --- a/tests.branching/edit-works-after-branch-root-was-renamed.stdout +++ b/tests.branching/edit-works-after-branch-root-was-renamed.stdout @@ -1,7 +1,5 @@ d . d ./.morph -d ./.morph/cache -d ./.morph/cache/gits d ./master d ./master/.morph-system-branch d ./master/my-renamed-morphs diff --git a/tests.branching/setup b/tests.branching/setup index c18a5ac6..11fdf0f1 100755 --- a/tests.branching/setup +++ b/tests.branching/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 |