Enable verbose output from “test/run” if VERBOSE is set

diff --git a/misc/build-in-docker b/misc/build-in-docker
index c0c6ba0318228f5b843e74b4c7f73429ffdd309b..53a7a9b304f297a567c4535a9a3326809f04640b 100755 (executable)
--- a/misc/build-in-docker
+++ b/misc/build-in-docker
@@ -48,5 +48,6 @@ docker run --rm \
     --env NO_TEST="${NO_TEST:-}" \
     --env SCAN_BUILD="${SCAN_BUILD:-}" \
     --env SPECIAL="${SPECIAL:-}" \
+    --env VERBOSE="${VERBOSE:-}" \
     "$tag" \
     /source/ci/build "$@"

diff --git a/test/run b/test/run
index 23254b6a872432a8eebfe7a4919b1bb9cbb46188..e3bce01318cb0c9641ec55be0ad51717e07c02d4 100755 (executable)
--- a/test/run
+++ b/test/run
@@ -321,7 +321,7 @@ EOF
 
     CCACHE_COMPILE="$CCACHE $COMPILER"
 
-    if $VERBOSE; then
+    if $verbose; then
         printf "\n  %s" "$CURRENT_TEST"
     else
         printf .
@@ -523,8 +523,8 @@ else
 fi
 echo
 
-VERBOSE=false
-[ "$1" = "-v" ] && { VERBOSE=true; shift; }
+[ -z "${VERBOSE:-}" ] && verbose=false || verbose=true
+[ "$1" = "-v" ] && { verbose=true; shift; }
 
 suites="$*"
 if [ -z "$suites" ]; then