test/capture-log: Make it possible to disable capturing

When running in CI, we want everything to come out in one scrool.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/test/capture-log b/test/capture-log
index 4da14f244b9093935aba66b5fb392f7bcdd40bf1..3ab012e3c5814df7a1f7d256c069215e812f6861 100755 (executable)
--- a/test/capture-log
+++ b/test/capture-log
@@ -5,6 +5,14 @@
 set -e
 set -o pipefail
 
+actually_capture () {
+    if [ "$BUILD_VERBOSE" ]; then
+       tee "$log" | sed "s#^#$log #"
+    else
+       cat >"$log"
+    fi
+}
+
 log="$1"; shift
 mkdir -p tmp
-"$@" 2>&1 | ts >"$log"
+"$@" 2>&1 | ts | actually_capture