diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-06-26 11:39:21 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-06-26 11:39:21 +0100 |
| commit | b00ebe6baee22bd79e3aeca38a3390a25fbc5e14 (patch) | |
| tree | f5208d32d2a9f8a5a16255ee6de9a062ebad633a /tests.as-root | |
| parent | c2587cf3aac2e9c734e040de86f07e950042c112 (diff) | |
| download | morph-b00ebe6baee22bd79e3aeca38a3390a25fbc5e14.tar.gz | |
Fix test suite to deal with morph output changes
Also, some bug fixes.
Also, when handling a BaseException, log the exception (with traceback)
that we're handling, in case there is an error while handling it, because
the second error will otherwise mask the first one.
Diffstat (limited to 'tests.as-root')
| -rwxr-xr-x | tests.as-root/arm-system-writes-kernel.script | 2 | ||||
| -rwxr-xr-x | tests.as-root/setup | 2 | ||||
| -rwxr-xr-x | tests.as-root/system-overlap.script | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/tests.as-root/arm-system-writes-kernel.script b/tests.as-root/arm-system-writes-kernel.script index 7f9c79b2..500cedba 100755 --- a/tests.as-root/arm-system-writes-kernel.script +++ b/tests.as-root/arm-system-writes-kernel.script @@ -75,5 +75,5 @@ git add linux.morph git commit --quiet -m 'Make the kernel create a dummy zImage' "$SRCDIR/scripts/test-morph" \ - build test:morphs-repo arm arm-system.morph + build test:morphs-repo arm arm-system.morph > /dev/null [ -e "$cache"/*system.arm-system-kernel ] || find "$cache" diff --git a/tests.as-root/setup b/tests.as-root/setup index 59e4a944..1d32b14d 100755 --- a/tests.as-root/setup +++ b/tests.as-root/setup @@ -142,5 +142,7 @@ cachedir = $DATADIR/cache log = $DATADIR/morph.log keep-path = true no-distcc = true +quiet = true +log = /tmp/morph.log EOF diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script index 28307301..71b55e24 100755 --- a/tests.as-root/system-overlap.script +++ b/tests.as-root/system-overlap.script @@ -118,7 +118,7 @@ git add overlap-*.morph git commit --quiet -m 'Add overlapping chunks' "$SRCDIR/scripts/test-morph" \ - build test:morphs-repo overlap overlap-system.morph + build test:morphs-repo overlap overlap-system.morph > /devN7ll "$SRCDIR/scripts/list-overlaps" groups \ "$cache"/*.system.overlap-system.overlaps | while IFS='\n' read overlaps; do |