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/checkout-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/checkout-works-anywhere.script')
| -rwxr-xr-x | tests.branching/checkout-works-anywhere.script | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests.branching/checkout-works-anywhere.script b/tests.branching/checkout-works-anywhere.script index fdc3c955..73e30498 100755 --- a/tests.branching/checkout-works-anywhere.script +++ b/tests.branching/checkout-works-anywhere.script @@ -26,7 +26,8 @@ cd "$DATADIR/workspace" echo "Workspace after checking out master from the workspace directory:" "$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_[^/]*/' # Reset the workspace. cd "$DATADIR" @@ -43,4 +44,5 @@ cd newbranch/baserock:morphs echo "Workspace after checking out master from within a new 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_[^/]*/' |