commit bda3e46846052eb84852e5ecb6a3828c849153e3
author Thomas Daubney <thomas.daubney@arm.com> Tue Jul 30 15:52:58 2024 +0100
committer Thomas Daubney <thomas.daubney@arm.com> Tue Jul 30 15:52:58 2024 +0100
tree de4ac9ec12064793b06d709e9c4337d6d3697254
parent b991ac2d9078ee82206bd4fb115f1dd26fdbad4b

Check for file at script startup

Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>

scripts/lcov.sh

diff --git a/scripts/lcov.sh b/scripts/lcov.sh
index 2885537..2d2f42b 100755
--- a/scripts/lcov.sh
+++ b/scripts/lcov.sh
@@ -32,13 +32,13 @@
 
 # Project detection
 PROJECT_NAME_FILE='./scripts/project_name.txt'
+if read -r PROJECT_NAME < "$PROJECT_NAME_FILE"; then :; else
+    echo "$PROJECT_NAME_FILE does not exist... Exiting..." >&2
+    exit 1
+fi
 
 in_mbedtls_repo () {
-    if [ ! -f $PROJECT_NAME_FILE ]; then
-        echo "$PROJECT_NAME_FILE does not exist... Exiting..." >&2
-        exit 1
-    fi
-    grep -Fxq "Mbed TLS" "$PROJECT_NAME_FILE"
+    test "$PROJECT_NAME" = "Mbed TLS"
 }
 
 # Collect stats and build a HTML report.

tests/scripts/all.sh

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index a68c778..825cc67 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -117,21 +117,17 @@
 
 # For project detection
 PROJECT_NAME_FILE='./scripts/project_name.txt'
+if read -r PROJECT_NAME < "$PROJECT_NAME_FILE"; then :; else
+    echo "$PROJECT_NAME_FILE does not exist... Exiting..." >&2
+    exit 1
+fi
 
 in_mbedtls_repo () {
-    if [ ! -f $PROJECT_NAME_FILE ]; then
-        echo "$PROJECT_NAME_FILE does not exist... Exiting..." >&2
-        exit 1
-    fi
-    grep -Fxq "Mbed TLS" "$PROJECT_NAME_FILE"
+    test "$PROJECT_NAME" = "Mbed TLS"
 }
 
 in_tf_psa_crypto_repo () {
-    if [ ! -f $PROJECT_NAME_FILE ]; then
-        echo "$PROJECT_NAME_FILE does not exist... Exiting..." >&2
-        exit 1
-    fi
-    grep -Fxq "TF-PSA-Crypto" "$PROJECT_NAME_FILE"
+    test "$PROJECT_NAME" = "TF-PSA-Crypto"
 }
 
 pre_check_environment () {