commit b9e99511c5b14db83cdfb3a20d6ee76415f1879f
author Xinyu Zhang <xinyu.zhang@arm.com> Mon Oct 30 12:15:00 2023 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Mon Oct 30 13:58:47 2023 +0800
tree a1fc2d24aafaa490f6f0aea7f98172c15eeb7fd8
parent b0e9c42eefcce099202d4a2bd56f5e77af3e0256

clone.sh: Parse PSA arch tests version from tf-m-tests

In TF-M split build system, version of PSA arch tests is set in
tf-m-tests. So parse PSA arch tests version and clone the repo after
tf-m-tests being cloned.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I2eb23ab1ca21f781742c846329e09ecce678e015

clone.sh

diff --git a/clone.sh b/clone.sh
index 064eed1..863006f 100755
--- a/clone.sh
+++ b/clone.sh
@@ -101,10 +101,6 @@
 MCUBOOT_REFSPEC="${MCUBOOT_REFSPEC:-"$(parse_version config/config_base.cmake set\(MCUBOOT_VERSION \" 2)"}"
 MCUBOOT_NAME="mcuboot"
 
-PSA_ARCH_TESTS_PROJECT="${PSA_ARCH_TESTS_URL:-}"
-PSA_ARCH_TESTS_REFSPEC="${PSA_ARCH_TESTS_VERSION:-}"
-PSA_ARCH_TESTS_NAME="psa-arch-tests"
-
 QCBOR_PROJECT="${QCBOR_URL:-}"
 QCBOR_REFSPEC="${QCBOR_VERSION:-"$(parse_version lib/ext/qcbor/CMakeLists.txt set\(QCBOR_VERSION \" 2)"}"
 QCBOR_NAME="qcbor"
@@ -122,7 +118,6 @@
     "${TFM_TESTS_PROJECT};${TFM_TESTS_NAME};${TFM_TESTS_REFSPEC}"
     "${MBEDTLS_PROJECT};${MBEDTLS_NAME};${MBEDTLS_REFSPEC}"
     "${MCUBOOT_PROJECT};${MCUBOOT_NAME};${MCUBOOT_REFSPEC}"
-    "${PSA_ARCH_TESTS_PROJECT};${PSA_ARCH_TESTS_NAME};${PSA_ARCH_TESTS_REFSPEC}"
     "${QCBOR_PROJECT};${QCBOR_NAME};${QCBOR_REFSPEC}"
     "${TFM_EXTRAS_PROJECT};${TFM_EXTRAS_NAME};${TFM_EXTRAS_REFSPEC}"
     "${QA_TOOLS_PROJECT};${QA_TOOLS_NAME};${QA_TOOLS_REFSPEC}"
@@ -136,3 +131,9 @@
 
     clone_repo_to_share_folder "${REPO_URL}" "${REPO_NAME}" "${REPO_REFSPEC}"
 done
+
+PSA_ARCH_TESTS_PROJECT="${PSA_ARCH_TESTS_URL:-}"
+PSA_ARCH_TESTS_REFSPEC="${PSA_ARCH_TESTS_VERSION:-"$(parse_version ../tf-m-tests/tests_psa_arch/fetch_repo/CMakeLists.txt set\(PSA_ARCH_TESTS_VERSION \" 2)"}"
+PSA_ARCH_TESTS_NAME="psa-arch-tests"
+
+clone_repo_to_share_folder "${PSA_ARCH_TESTS_PROJECT}" "${PSA_ARCH_TESTS_NAME}" "${PSA_ARCH_TESTS_REFSPEC}"