diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-10-26 15:40:26 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-10-26 15:40:26 +0000 |
| commit | 9e4159ba97862c78a9cfa3e3816f18c708ccba5e (patch) | |
| tree | 5a025263c1c85a20b4cba302df2c3b9981b359b7 /tests.branching | |
| parent | 41d796afda6c1565acc3d265b1ec4938a9a242d9 (diff) | |
| download | morph-9e4159ba97862c78a9cfa3e3816f18c708ccba5e.tar.gz | |
Simplify checkout-non-aliased-repos test
The output of the list-tree depended on the value of TMPDIR.
Instead we replace this with a test that the required directory exists.
merge-with-stratum-renamed also fails with a TMPDIR different to /tmp,
but I have no idea why.
Signed off by Daniel Silverstone in person
Diffstat (limited to 'tests.branching')
| -rwxr-xr-x | tests.branching/checkout-non-aliased-repos.script | 14 | ||||
| -rw-r--r-- | tests.branching/checkout-non-aliased-repos.stdout | 32 |
2 files changed, 2 insertions, 44 deletions
diff --git a/tests.branching/checkout-non-aliased-repos.script b/tests.branching/checkout-non-aliased-repos.script index 75b68bea..b98add2c 100755 --- a/tests.branching/checkout-non-aliased-repos.script +++ b/tests.branching/checkout-non-aliased-repos.script @@ -34,12 +34,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" checkout "$REPO_WITH_SUFFIX" master -echo "File tree of repo with suffix:" -"$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | - sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' | - grep -v 'cache/gits/file_[^/]*/' | - sed "s,${DATADIR:1},DATADIR,g" | - sed "s,${TEMP_DIR:1},TEMP_DIR,g" +test -d "$DATADIR/workspace/master/$DATADIR/morphs" echo "Current branches of repo with suffix:" "$SRCDIR/scripts/run-git-in" master/"${DATADIR:1}"/morphs branch @@ -52,12 +47,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" checkout "$REPO_WITHOUT_SUFFIX" master -echo "File tree of repo without suffix:" -"$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | - sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' | - grep -v 'cache/gits/file_[^/]*/' | - sed "s,${DATADIR:1},DATADIR,g" | - sed "s,${TEMP_DIR:1},TEMP_DIR,g" +test -d "$DATADIR/workspace/master/$DATADIR/morphs" echo "Current branches of repo without suffix:" "$SRCDIR/scripts/run-git-in" master/"${DATADIR:1}"/morphs branch diff --git a/tests.branching/checkout-non-aliased-repos.stdout b/tests.branching/checkout-non-aliased-repos.stdout index 6f651f5b..2d056c2f 100644 --- a/tests.branching/checkout-non-aliased-repos.stdout +++ b/tests.branching/checkout-non-aliased-repos.stdout @@ -1,36 +1,4 @@ -File tree of repo with suffix: -d . -d ./.morph -d ./.morph/cache -d ./.morph/cache/gits -d ./.morph/cache/gits/file_git -d ./master -d ./master/.morph-system-branch -d ./master/tmp -d ./master/TEMP_DIR -d ./master/DATADIR -d ./master/DATADIR/morphs -d ./master/DATADIR/morphs/.git -f ./master/.morph-system-branch/config -f ./master/DATADIR/morphs/hello-stratum.morph -f ./master/DATADIR/morphs/hello-system.morph Current branches of repo with suffix: * master -File tree of repo without suffix: -d . -d ./.morph -d ./.morph/cache -d ./.morph/cache/gits -d ./.morph/cache/gits/file_morphs -d ./master -d ./master/.morph-system-branch -d ./master/tmp -d ./master/TEMP_DIR -d ./master/DATADIR -d ./master/DATADIR/morphs -d ./master/DATADIR/morphs/.git -f ./master/.morph-system-branch/config -f ./master/DATADIR/morphs/hello-stratum.morph -f ./master/DATADIR/morphs/hello-system.morph Current branches of repo without suffix: * master |