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.

3 files changed, 4 insertions, 2 deletions

diff --git a/tests/setup b/tests/setup
index 663f591e..5a6668a3 100755
--- a/tests/setup
+++ b/tests/setup
@@ -124,5 +124,6 @@ cachedir = $DATADIR/cache
 log = $DATADIR/morph.log
 keep-path = true
 no-distcc = true
+quiet = true
 EOF
 
diff --git a/tests/stratum-overlap-warns.script b/tests/stratum-overlap-warns.script
index 2e9965fe..ab6c6de6 100755
--- a/tests/stratum-overlap-warns.script
+++ b/tests/stratum-overlap-warns.script
@@ -29,7 +29,8 @@ warning_mentions(){
 }
 
 "$SRCDIR/scripts/test-morph" \
-    build --log=$log test:morphs-repo overlap overlap-stratum.morph
+    build --log=$log test:morphs-repo overlap overlap-stratum.morph \
+        > /dev/null
 grep WARNING "$log" >"$warnings"
 for str in overlap-stratum \
            overlap-foo-baz overlap-foobar bin/bar \
diff --git a/tests/stratum-overlap-writes-overlap.script b/tests/stratum-overlap-writes-overlap.script
index 28d3d044..d40d3ba5 100755
--- a/tests/stratum-overlap-writes-overlap.script
+++ b/tests/stratum-overlap-writes-overlap.script
@@ -24,7 +24,7 @@ cache="$DATADIR/cache/artifacts"
 
 
 "$SRCDIR/scripts/test-morph" \
-    build test:morphs-repo overlap overlap-stratum.morph
+    build test:morphs-repo overlap overlap-stratum.morph > /dev/null
 "$SRCDIR/scripts/list-overlaps" groups \
         "$cache"/*.stratum.overlap-stratum.overlaps |
 while IFS='\n' read overlaps; do