diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-14 09:33:54 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-14 17:25:29 +0100 |
| commit | 154fca16eb20023bdaafc20cb15636c12a33efb1 (patch) | |
| tree | cf7daf2daa7bd853ff0c721c7360b00e4f2fd975 /tests.branching/branch-works-anywhere.script | |
| parent | e95f04846f5ecc82ce0c7e638756059442de8d23 (diff) | |
| download | morph-154fca16eb20023bdaafc20cb15636c12a33efb1.tar.gz | |
Rework the blackbox tests for bare caches.
This reworks the blackbox tests to work with the bare repository caches. For
the most part it's slight changes to error messages and tweaks to ignore the
repository caches during file listing.
Diffstat (limited to 'tests.branching/branch-works-anywhere.script')
| -rwxr-xr-x | tests.branching/branch-works-anywhere.script | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests.branching/branch-works-anywhere.script b/tests.branching/branch-works-anywhere.script index 85098f49..19a00024 100755 --- a/tests.branching/branch-works-anywhere.script +++ b/tests.branching/branch-works-anywhere.script @@ -26,14 +26,16 @@ cd "$DATADIR/workspace" echo "Workspace after creating the first branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | - sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' + sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' | + grep -v 'cache/gits/file_[^/]*/' # Now, create a nother branch from the workspace. "$SRCDIR/scripts/test-morph" branch baserock:morphs branch2 echo "Workspace after creating the second branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | - sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' + sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' | + grep -v 'cache/gits/file_[^/]*/' # Now, enter the first branch and create a third branch, which # should not be created in the working directory but in the @@ -43,7 +45,8 @@ cd "$DATADIR/workspace/branch1" echo "Workspace after creating the third branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | - sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' + sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' | + grep -v 'cache/gits/file_[^/]*/' # Now, go into the morphs repository of that third branch and # create a fourth system branch from in there. This, too, should @@ -53,4 +56,5 @@ cd "$DATADIR/workspace/branch3/baserock:morphs" echo "Workspace after creating the fourth branch:" "$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | - sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' + sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' | + grep -v 'cache/gits/file_[^/]*/' |