diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-06-07 12:09:49 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-06-07 12:09:49 +0100 |
| commit | 66cdc1f0288385d02e4a914a5c11ae72c004a812 (patch) | |
| tree | de5f19465ac3e7d15918b9c1a7129a4baf1a9db8 | |
| parent | 4d7bb9e464454e1dd91c7f81868e7673244bc1f6 (diff) | |
| download | morph-66cdc1f0288385d02e4a914a5c11ae72c004a812.tar.gz | |
Fix test case so it works on Debian squeeze
This only fixes the output so it is independent of the way various
tools change output on different systems (sqeeze vs baserock).
| -rwxr-xr-x | tests.as-root/system-overlap.script | 3 | ||||
| -rw-r--r-- | tests.as-root/system-overlap.stdout | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script index 111b236f..d2b0363d 100755 --- a/tests.as-root/system-overlap.script +++ b/tests.as-root/system-overlap.script @@ -120,4 +120,5 @@ 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/' +grep "WARNING\s" $log | sed 's/^.*WARNING/WARNING/' | + sed 's/ \.\// /' diff --git a/tests.as-root/system-overlap.stdout b/tests.as-root/system-overlap.stdout index e43cb6a5..46bbaece 100644 --- a/tests.as-root/system-overlap.stdout +++ b/tests.as-root/system-overlap.stdout @@ -3,5 +3,5 @@ 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 bin/bar +WARNING bin/foo |