Use new functions

Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
Mbed-TLS · Nov 7, 2024 · b2decd6 · b2decd6
1 parent 57f227b
commit b2decd6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 32 deletions.
diff --git a/scripts/lcov.sh b/scripts/lcov.sh
@@ -30,16 +30,7 @@ EOF
 
 set -eu
 
-# 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 () {
-    test "$PROJECT_NAME" = "Mbed TLS"
-}
+. ../framework/scripts/project_detection.sh
 
 # Collect stats and build a HTML report.
 lcov_library_report () {

diff --git a/tests/scripts/all-core.sh b/tests/scripts/all-core.sh
@@ -131,22 +131,8 @@ pre_set_shell_options () {
     set -e -o pipefail -u
 }
 
-# For project detection
-in_mbedtls_repo () {
-    test "$PROJECT_NAME" = "Mbed TLS"
-}
-
-in_tf_psa_crypto_repo () {
-    test "$PROJECT_NAME" = "TF-PSA-Crypto"
-}
-
 pre_check_environment () {
-    # 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
+    . ../../framework/scripts/project_detection.sh
 
     if in_mbedtls_repo || in_tf_psa_crypto_repo; then :; else
         echo "Must be run from Mbed TLS / TF-PSA-Crypto root" >&2
@@ -1029,3 +1015,5 @@ main () {
     # We're done.
     post_report
 }
+
+main
diff --git a/tests/scripts/check-generated-files.sh b/tests/scripts/check-generated-files.sh
@@ -22,13 +22,7 @@ EOF
     exit
 fi
 
-in_mbedtls_repo () {
-    test -d include -a -d library -a -d programs -a -d tests
-}
-
-in_tf_psa_crypto_repo () {
-    test -d include -a -d core -a -d drivers -a -d programs -a -d tests
-}
+. ../../framework/scripts/project_detection.sh
 
 if in_mbedtls_repo; then
     library_dir='library'