From d4a5563417a9c0252aae3720f8e087822510a7fb Mon Sep 17 00:00:00 2001
From: Dave Rodgman <dave.rodgman@arm.com>
Date: Thu, 15 Feb 2024 14:39:48 +0000
Subject: [PATCH] Improve output from make/cmake wrapper

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
---
 tests/scripts/quiet/cmake | 25 ++++++++++++++++++++++---
 tests/scripts/quiet/make  | 25 ++++++++++++++++++++++---
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/tests/scripts/quiet/cmake b/tests/scripts/quiet/cmake
index 2e95c6b938..e3114a86fc 100755
--- a/tests/scripts/quiet/cmake
+++ b/tests/scripts/quiet/cmake
@@ -18,13 +18,32 @@ TOOL=$(basename "$0")
 # Locate original tool
 ORIGINAL_TOOL=$(type -ap ${TOOL} | grep -v "$0" | head -n1 )
 
+quote_args() {
+    # similar to printf '%q' "$@"
+    # but produce more human-readable results for common/simple cases like "a b"
+    local args=("$@")
+    s=""
+    for a in "${args[@]}"; do
+        simple_pattern='^[[:alnum:] _=+-]*$'
+        if [[ $a =~ ' ' && $a =~ $simple_pattern ]]; then
+            # a has spaces, but no other special characters that need escaping
+            # (quoting after removing spaces yields no backslashes)
+            # simplify quoted form to "$a" - e.g. yield "a b c" instead of a\ b\ c
+            q="\"$a\""
+        else
+            # get bash to do the quoting
+            q=$(printf '%q' "$a")
+        fi
+        s="$s $q"
+    done
+    echo $s
+}
+
 if [[ ! " $@ " =~ " --version " ]]; then
     # Display the command being invoked - if it succeeds, this is all that will
     # be displayed. Don't do this for invocations with --version, because
     # this output is often parsed by scripts, so we don't want to modify it.
-    echo -n "${TOOL} "
-    printf '%q ' "$@"
-    echo
+    echo "${TOOL} $(quote_args "$@")"
 fi
 
 if [[ " $@ " =~ $NO_SILENCE || -n "${VERBOSE_LOGS}" ]]; then
diff --git a/tests/scripts/quiet/make b/tests/scripts/quiet/make
index 0c4869644e..257703ec93 100755
--- a/tests/scripts/quiet/make
+++ b/tests/scripts/quiet/make
@@ -18,13 +18,32 @@ TOOL=$(basename "$0")
 # Locate original tool
 ORIGINAL_TOOL=$(type -ap ${TOOL} | grep -v "$0" | head -n1 )
 
+quote_args() {
+    # similar to printf '%q' "$@"
+    # but produce more human-readable results for common/simple cases like "a b"
+    local args=("$@")
+    s=""
+    for a in "${args[@]}"; do
+        simple_pattern='^[[:alnum:] _=+-]*$'
+        if [[ $a =~ ' ' && $a =~ $simple_pattern ]]; then
+            # a has spaces, but no other special characters that need escaping
+            # (quoting after removing spaces yields no backslashes)
+            # simplify quoted form to "$a" - e.g. yield "a b c" instead of a\ b\ c
+            q="\"$a\""
+        else
+            # get bash to do the quoting
+            q=$(printf '%q' "$a")
+        fi
+        s="$s $q"
+    done
+    echo $s
+}
+
 if [[ ! " $@ " =~ " --version " ]]; then
     # Display the command being invoked - if it succeeds, this is all that will
     # be displayed. Don't do this for invocations with --version, because
     # this output is often parsed by scripts, so we don't want to modify it.
-    echo -n "${TOOL} "
-    printf '%q ' "$@"
-    echo
+    echo "${TOOL} $(quote_args "$@")"
 fi
 
 if [[ " $@ " =~ $NO_SILENCE || -n "${VERBOSE_LOGS}" ]]; then