diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-06-08 15:03:49 +0100 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-06-08 15:03:49 +0100 |
commit | bdc3ed5b6394ef3d685cd155fef9e1904802f106 (patch) | |
tree | 25a21c779f1426a6d677410ff9cb380ad28129f5 /tests.as-root | |
parent | 3cf1c554bcd095fe5d6ca755c2e318c781a0ecd0 (diff) | |
download | morph-bdc3ed5b6394ef3d685cd155fef9e1904802f106.tar.gz |
Fix again
It's too hard to test things on multiple machines at once before committing.
Diffstat (limited to 'tests.as-root')
-rwxr-xr-x | tests.as-root/system-overlap.script | 3 | ||||
-rw-r--r-- | tests.as-root/system-overlap.stdout | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script index 01a06676..afc8df2c 100755 --- a/tests.as-root/system-overlap.script +++ b/tests.as-root/system-overlap.script @@ -120,5 +120,4 @@ git commit --quiet -m 'Add overlapping chunks' "$SRCDIR/scripts/test-morph" \ build --log=$log test:morphs-repo overlap overlap-system.morph -grep "WARNING\s" $log | sed 's/^.*WARNING/WARNING/' | - sed 's/ *\.\// /' +grep "WARNING\s" $log | sed 's/^.*WARNING */WARNING /' diff --git a/tests.as-root/system-overlap.stdout b/tests.as-root/system-overlap.stdout index 46bbaece..33b70636 100644 --- a/tests.as-root/system-overlap.stdout +++ b/tests.as-root/system-overlap.stdout @@ -1,7 +1,7 @@ WARNING Overlaps in artifact foo-barqux-stratum detected -WARNING Artifacts overlap-foobar, overlap-fooqux overlap with files: -WARNING bin/foo +WARNING Artifacts overlap-foobar, overlap-fooqux overlap with files: +WARNING bin/foo WARNING Overlaps in artifact overlap-system detected -WARNING Artifacts foo-barqux-stratum, foo-baz-stratum overlap with files: -WARNING bin/bar -WARNING bin/foo +WARNING Artifacts foo-barqux-stratum, foo-baz-stratum overlap with files: +WARNING bin/bar +WARNING bin/foo |