Update path to all-core.sh
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
diff --git a/tests/scripts/mbedtls-all.sh b/tests/scripts/mbedtls-all.sh
index cdf296d..a1b062a 100755
--- a/tests/scripts/mbedtls-all.sh
+++ b/tests/scripts/mbedtls-all.sh
@@ -10,7 +10,6 @@
# This script must be invoked from the project's root.
-# The path is going to change when this is moved to the framework
-source tests/scripts/all-core.sh
+source framework/scripts/all-core.sh
main "$@"
diff --git a/tf-psa-crypto/tests/scripts/all.sh b/tf-psa-crypto/tests/scripts/all.sh
index e26abd8..86b0609 100755
--- a/tf-psa-crypto/tests/scripts/all.sh
+++ b/tf-psa-crypto/tests/scripts/all.sh
@@ -11,13 +11,18 @@
# This script must be invoked from the project's root.
# Prevent silly mistakes when people would invoke this from mbedtls
-if [ -d tf-psa-crypto -a -d library ]; then
+if [ -d tf-psa-crypto -a -d include/mbedtls ]; then
echo "When invoking this script from an mbedtls checkout," >&2
echo "you must change the working directory to tf-psa-crypto." >&2
exit 255
fi
-# The path is going to change when this is moved to the framework
-source ../tests/scripts/all-core.sh
+if [ -d ../include/mbedtls -a -d ../framework ]; then
+ # Running inside an mbedtls checkout: get the framework from mbedtls.
+ source ../framework/scripts/all-core.sh
+else
+ # Running standalone: use our own framework.
+ source framework/scripts/all-core.sh
+fi
main "$@"