diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-05-14 17:37:22 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-05-14 17:37:22 +0000 |
| commit | f4591a35bb530bbee91b62a4a0a2313e1c480faf (patch) | |
| tree | c3d114164f938ad69d4bc8ddbc37e1670a76943e /tests.as-root | |
| parent | 41c647ec20d3e58348535e5d2f76f80e977b47ce (diff) | |
| download | morph-f4591a35bb530bbee91b62a4a0a2313e1c480faf.tar.gz | |
tests: update to produce less useless output
output is properly sorted, and redundant data is removed
also the stratum in stratum-overlap-*.setup are unpacked in a different
order, so there is a symlink to stomp first
Diffstat (limited to 'tests.as-root')
| -rwxr-xr-x | tests.as-root/system-overlap.script | 2 | ||||
| -rw-r--r-- | tests.as-root/system-overlap.stdout | 25 |
2 files changed, 2 insertions, 25 deletions
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script index 066f39cf..111b236f 100755 --- a/tests.as-root/system-overlap.script +++ b/tests.as-root/system-overlap.script @@ -119,5 +119,5 @@ git add overlap-*.morph git commit --quiet -m 'Add overlapping chunks' "$SRCDIR/scripts/test-morph" \ - build --verbose --log=$log test:morphs-repo overlap overlap-system.morph + build --log=$log test:morphs-repo overlap overlap-system.morph 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 c984ab16..e43cb6a5 100644 --- a/tests.as-root/system-overlap.stdout +++ b/tests.as-root/system-overlap.stdout @@ -1,30 +1,7 @@ -Build starts -Building test:morphs-repo overlap overlap-system.morph -Figuring out the right build order -Cloning/updating test:chunk-repo -Cloning/updating test:chunk-repo -Cloning/updating test:kernel-repo -Cloning/updating test:chunk-repo -Cloning/updating test:morphs-repo -Cloning/updating test:morphs-repo -Cloning/updating test:morphs-repo -Building overlap-foo-baz -Building overlap-foobar -Building linux -Building overlap-fooqux -Building foo-baz-stratum -Building foo-barqux-stratum -Building overlap-system WARNING Overlaps in artifact foo-barqux-stratum detected WARNING Artifacts overlap-foobar, overlap-fooqux overlap with files: WARNING bin/foo WARNING Overlaps in artifact overlap-system detected -WARNING Artifacts foo-baz-stratum, foo-barqux-stratum overlap with files: +WARNING Artifacts foo-barqux-stratum, foo-baz-stratum overlap with files: WARNING ./bin/bar WARNING ./bin/foo - chunk.linux - chunk.overlap-foo-baz - chunk.overlap-foobar - chunk.overlap-fooqux - stratum.foo-barqux-stratum - stratum.foo-baz-stratum |