From e2317649dd41a58911d95265f187082c6c29673c Mon Sep 17 00:00:00 2001
From: Dave Rodgman <dave.rodgman@arm.com>
Date: Mon, 26 Feb 2024 17:27:18 +0000
Subject: [PATCH] Allow wrappers to be missing; quote directory name from make

Co-authored-by: Gilles Peskine <gilles.peskine@arm.com>
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
---
 tests/scripts/all.sh     | 10 ++--------
 tests/scripts/quiet/make |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index b1a3462ee8..4065e7129d 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -205,14 +205,8 @@ setup_quiet_wrappers()
     # unless there is an error. This reduces logging overhead in the CI.
     #
     # Note that the cmake wrapper breaks unless we use an absolute path here.
-    export PATH=${PWD}/tests/scripts/quiet:$PATH
-    if [[ ! -x ${PWD}/tests/scripts/quiet/make ]]; then
-        echo "can't find quiet/make"
-        exit 1
-    fi
-    if [[ ! -x ${PWD}/tests/scripts/quiet/cmake ]]; then
-        echo "can't find quiet/cmake"
-        exit 1
+    if [[ -e ${PWD}/tests/scripts/quiet ]]; then
+        export PATH=${PWD}/tests/scripts/quiet:$PATH
     fi
 }
 
diff --git a/tests/scripts/quiet/make b/tests/scripts/quiet/make
index a1ef3e565d..162d44de6c 100755
--- a/tests/scripts/quiet/make
+++ b/tests/scripts/quiet/make
@@ -15,4 +15,4 @@ export NO_SILENCE=" --version | test "
 
 export TOOL="make"
 
-exec $(dirname "$0")/quiet "$@"
+exec "$(dirname "$0")/quiet" "$@"