Improve quote_args output readability
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
diff --git a/tests/scripts/quiet/cmake b/tests/scripts/quiet/cmake
index e3114a8..a79d757 100755
--- a/tests/scripts/quiet/cmake
+++ b/tests/scripts/quiet/cmake
@@ -24,12 +24,14 @@
local args=("$@")
s=""
for a in "${args[@]}"; do
- simple_pattern='^[[:alnum:] _=+-]*$'
+ simple_pattern='^([[:alnum:]_+-]+=)?([[: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\""
+ # simplify quoted form - e.g.:
+ # a b -> "a b"
+ # CFLAGS=a b -> CFLAGS="a b"
+ q="${BASH_REMATCH[1]}\"${BASH_REMATCH[2]}\""
else
# get bash to do the quoting
q=$(printf '%q' "$a")
diff --git a/tests/scripts/quiet/make b/tests/scripts/quiet/make
index 257703e..9722029 100755
--- a/tests/scripts/quiet/make
+++ b/tests/scripts/quiet/make
@@ -24,12 +24,14 @@
local args=("$@")
s=""
for a in "${args[@]}"; do
- simple_pattern='^[[:alnum:] _=+-]*$'
+ simple_pattern='^([[:alnum:]_+-]+=)?([[: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\""
+ # simplify quoted form - e.g.:
+ # a b -> "a b"
+ # CFLAGS=a b -> CFLAGS="a b"
+ q="${BASH_REMATCH[1]}\"${BASH_REMATCH[2]}\""
else
# get bash to do the quoting
q=$(printf '%q' "$a")