Remove use of CFG_DEV_PATH and CFG_OPTEE_TEST_PATH
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Pascal Brand <pascal.brand@st.com>
diff --git a/scripts/.env b/scripts/.env
index 8259f75..91d9bdb 100644
--- a/scripts/.env
+++ b/scripts/.env
@@ -148,10 +148,6 @@
LCI_PRINT_HEADER "Linaro"
LCI_PRINT_SEPARATOR
-LCI_PRINT_L1 "User environment"
-LCI_CHECKDIR "CFG_DEV_PATH"
-
-LCI_PRINT_SEPARATOR
LCI_PRINT_L1 "OP-TEE components"
LCI_CHECKDIR "TA_DEV_KIT_DIR"
diff --git a/scripts/enable_gp_testsuite.sh b/scripts/enable_gp_testsuite.sh
index 83cd7b7..c8ee115 100755
--- a/scripts/enable_gp_testsuite.sh
+++ b/scripts/enable_gp_testsuite.sh
@@ -29,12 +29,12 @@
echo -e "| Processing ..."
-GP_XTEST_OUT_DIR="${CFG_DEV_PATH}/optee_test/host/xtest"
+GP_XTEST_OUT_DIR="${OPTEE_TEST_ROOT}/host/xtest"
export GP_XTEST_OUT_DIR
GP_XTEST_IN_DIR="${GP_XTEST_OUT_DIR}/global_platform/${CFG_GP_API}"
export GP_XTEST_IN_DIR
-GP_USERTA_DIR="${CFG_DEV_PATH}/optee_test/ta"
+GP_USERTA_DIR="${OPTEE_TEST_ROOT}/ta"
export GP_USERTA_DIR
echo -e "| Clean"
diff --git a/scripts/patch_gp_testsuite.sh b/scripts/patch_gp_testsuite.sh
index 5dd09fd..75efaef 100755
--- a/scripts/patch_gp_testsuite.sh
+++ b/scripts/patch_gp_testsuite.sh
@@ -199,7 +199,7 @@
# openssl .h file installation
if [ -d /usr/include/openssl ]; then
- forgpdir=${CFG_DEV_PATH}/optee_test/host/xtest/for_gp/
+ forgpdir=${OPTEE_TEST_ROOT}/host/xtest/for_gp/
mkdir -p ${forgpdir}/include/openssl ${forgpdir}/lib
[ -d /usr/include/x86_64-linux-gnu/openssl ] && LCI_CPD /usr/include/x86_64-linux-gnu/openssl ${forgpdir}/include
for f in /usr/include/openssl/*.h ; do
@@ -214,7 +214,7 @@
cd ${CDIR}
LCI_PRINT_L1 "Update test: 9238 (TEE_GetOperationInfoMultiple)"
-ARRAY=(["FILE"]="${CFG_OPTEE_TEST_PATH}/host/xtest/xtest_9000.c"
+ARRAY=(["FILE"]="${OPTEE_TEST_ROOT}/host/xtest/xtest_9000.c"
["PATCH"]="${CFG_GP_XSL_PACKAGE_PATH}/host/xtest/xtest_9000.c.patch")
LCI_PATCH ${ARRAY[FILE]} ${ARRAY[PATCH]}
LCI_PRINT_SEPARATOR