Skip to content

Commit b7d5084

Browse files
Agaba-derricksmlambertkarianna
authored
fix: prevent duplicate execution of testenvSettings.sh when DYNAMIC_COMPILE=false (#6765)
* fix: prevent duplicate execution of testenvSettings.sh when DYNAMIC_COMPILE=false Signed-off-by: Agaba-derrick <[email protected]> * remove SyntheticGC file and fix the comments Signed-off-by: Agaba-derrick <[email protected]> * fix the comments with the right one Signed-off-by: Agaba-derrick <[email protected]> * Update buildenv/jenkins/JenkinsfileBase Co-authored-by: Martijn Verburg <[email protected]> --------- Signed-off-by: Agaba-derrick <[email protected]> Co-authored-by: Shelley Lambert <[email protected]> Co-authored-by: Martijn Verburg <[email protected]>
1 parent 6dce4d5 commit b7d5084

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

buildenv/jenkins/JenkinsfileBase

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ import org.tap4j.model.TestSet;
66
def makeTest(testParam) {
77
String tearDownCmd = "$RESOLVED_MAKE; \$MAKE -f ./aqa-tests/TKG/testEnv.mk testEnvTeardown"
88
// Note: keyword source cannot be used in Jenkins script. Therefore, using "." instead.
9-
String makeTestCmd = "$RESOLVED_MAKE;cd ./aqa-tests; . ./scripts/testenv/testenvSettings.sh;cd ./TKG; \$MAKE $testParam"
9+
// When DYNAMIC_COMPILE=false, do not source testenvSettings.sh (to avoid calling it twice). Only
10+
// source the settings when env.DYNAMIC_COMPILE is true.
11+
String makeTestCmd = "$RESOLVED_MAKE;cd ./aqa-tests/TKG; \$MAKE $testParam"
12+
if (env.DYNAMIC_COMPILE) {
13+
makeTestCmd = "$RESOLVED_MAKE;cd ./aqa-tests; . ./scripts/testenv/testenvSettings.sh;cd ./TKG; \$MAKE $testParam"
14+
}
1015
//unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
1116
if (JDK_IMPL == 'hotspot' && PLATFORM.contains('alpine-linux')) {
1217
makeTestCmd = "unset LD_LIBRARY_PATH; $makeTestCmd"

0 commit comments

Comments
 (0)