Skip to content

Commit

Permalink
Pre-stage system test libs on the machines
Browse files Browse the repository at this point in the history
- added system_lib_dir env property to top.xml
- added condition to check the if the system_lib_dir property is set

related: adoptium/aqa-tests#4912

Signed-off-by: Anna Babu Palathingal <[email protected]>
  • Loading branch information
annaibm committed May 23, 2024
1 parent f8d647e commit 4ce7fce
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions stf.build/include/top.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 4ce7fce

Please sign in to comment.