diff options
| author | Lars Wirzenius <liw@liw.fi> | 2011-12-08 12:29:06 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2011-12-09 11:57:00 +0000 |
| commit | c4a6872bcb4cf2c5e9450004579d65b31aaa3741 (patch) | |
| tree | 4ca89c24720079e7db2cf4de0f372e94988aaf82 /tests | |
| parent | 36000e8d86934ea8b9f3e563b32c5389253d4864 (diff) | |
| download | morph-c4a6872bcb4cf2c5e9450004579d65b31aaa3741.tar.gz | |
if morph fails, dump its log to stderr so user can easily see it
Signed-off-by: Lars Wirzenius <liw@liw.fi>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/build-chunk.script | 5 | ||||
| -rwxr-xr-x | tests/build-stratum.script | 4 | ||||
| -rwxr-xr-x | tests/build-system.script | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/tests/build-chunk.script b/tests/build-chunk.script index 475d8c2b..a4e1fef6 100755 --- a/tests/build-chunk.script +++ b/tests/build-chunk.script @@ -20,9 +20,12 @@ set -e cache="$DATADIR/build-chunk-cache" +log="$DATADIR/build-chunk-morph.log" ./morph --no-default-configs build repo farrokh hello.morph \ --git-base-url="file://$DATADIR" \ - --cachedir="$cache" --keep-path --no-distcc + --cachedir="$cache" --keep-path --no-distcc \ + --log="$log" || cat "$log" 1>&2 + for chunk in "$cache/"*.chunk.* do echo "$chunk:" | sed 's/[^.]*//' diff --git a/tests/build-stratum.script b/tests/build-stratum.script index 81315711..bd938860 100755 --- a/tests/build-stratum.script +++ b/tests/build-stratum.script @@ -20,7 +20,9 @@ set -e cache="$DATADIR/build-stratum-cache" +log="$DATADIR/build-stratum-morph.log" ./morph --no-default-configs build repo farrokh hello-stratum.morph \ --git-base-url="file://$DATADIR" \ - --cachedir="$cache" --keep-path --no-distcc + --cachedir="$cache" --keep-path --no-distcc \ + --log="$log" || cat "$log" 1>&2 tar -tf "$cache/"*.stratum.* | LC_ALL=C sort | sed '/^\.\/./s:^\./::' diff --git a/tests/build-system.script b/tests/build-system.script index 1f81feda..c96662cc 100755 --- a/tests/build-system.script +++ b/tests/build-system.script @@ -20,7 +20,9 @@ set -e cache="$DATADIR/build-system-cache" +log="$DATADIR/build-system-morph.log" ./morph --no-default-configs build repo farrokh hello-system.morph \ --git-base-url="file://$DATADIR" \ - --cachedir="$cache" --keep-path --no-distcc + --cachedir="$cache" --keep-path --no-distcc \ + --log="$log" || cat "$log" 1>&2 find "$cache" -name '*.system.*' -type f | wc -l |