From c21e789072cf5aa3f7cc58be5116da1024ffc5a0 Mon Sep 17 00:00:00 2001
From: Anna Babu Palathingal <148897727+annaibm@users.noreply.github.com>
Date: Wed, 26 Jun 2024 17:13:50 -0400
Subject: [PATCH] Pre-stage system test libs on the machines (#139)

- added system_lib_dir env property to top.xml
- added condition to check the if the system_lib_dir property is set

related: https://github.com/adoptium/aqa-tests/issues/4912

Signed-off-by: Anna Babu Palathingal <anna.bp@ibm.com>
---
 stf.build/include/top.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/stf.build/include/top.xml b/stf.build/include/top.xml
index 069978e..f0f9f12 100644
--- a/stf.build/include/top.xml
+++ b/stf.build/include/top.xml
@@ -18,15 +18,18 @@ limitations under the License.
 
 	<!-- Set a property for accessing environment variables.  -->
 	<property environment="env"/>
+	<condition property="system_lib_dir" value="${env.SYSTEM_LIB_DIR}" else="${source_root}/../../systemtest_prereqs">
+		<isset property="env.SYSTEM_LIB_DIR"/>
+	</condition>
 
+	<echo message="system_lib_dir: ${system_lib_dir}"/>
 	<!-- Set default prereqs_root.  -->
 	<!-- If source has been checked out to /home/user/git/stf, default location for prereqs is /home/user/systemtest_prereqs.  -->
-	<property name="prereqs_root" location="${source_root}/../../systemtest_prereqs"/>
+	<property name="prereqs_root" location="${system_lib_dir}"/>
 
 	<!-- Test specific prereqs may have been added to prereqs-root (in path1;path2;path3 notation).
 	     Here the property first_prereqs_root is set containing just the first path in prereqs_root
 	     which is assumed to be where the make configure prereqs are installed. -->
-	<property name="prereqs_root" location="${source_root}/../../systemtest_prereqs"/>
 	<loadresource property="first_prereqs_root" encoding="UTF-8">
 		<concat>${prereqs_root}</concat>
 		<filterchain>