diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-06-14 15:51:26 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-06-14 15:51:26 +0000 |
| commit | e5ce2f18d589b595682044589f4f5527e5b1bee6 (patch) | |
| tree | 563fe38ea3445a2f81a5ee5498e446eff5b0df7b /tests.as-root/system-overlap.script | |
| parent | f33553534538be564461d57f81a63ffa4ca6fd54 (diff) | |
| download | morph-e5ce2f18d589b595682044589f4f5527e5b1bee6.tar.gz | |
tests: fix root scripts
make-patch expected a tarball
system-overlap was parsing logs rather than using a stable format
Diffstat (limited to 'tests.as-root/system-overlap.script')
| -rwxr-xr-x | tests.as-root/system-overlap.script | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script index 868d3e61..28307301 100755 --- a/tests.as-root/system-overlap.script +++ b/tests.as-root/system-overlap.script @@ -23,7 +23,6 @@ set -eu cache="$DATADIR/cache/artifacts" chunkrepo="$DATADIR/chunk-repo" morphsrepo="$DATADIR/morphs-repo" -log="$DATADIR/morph.log" cd "$morphsrepo" git checkout --quiet -b overlap master @@ -119,6 +118,11 @@ git add overlap-*.morph 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/ \.\// /' + build test:morphs-repo overlap overlap-system.morph +"$SRCDIR/scripts/list-overlaps" groups \ + "$cache"/*.system.overlap-system.overlaps | +while IFS='\n' read overlaps; do + echo $overlaps + "$SRCDIR/scripts/list-overlaps" list-files \ + "$cache"/*.system.overlap-system.overlaps $overlaps +done |