Commit 4779b26 1 parent b02fb82 commit 4779b26 Copy full SHA for 4779b26
File tree 1 file changed +3
-3
lines changed
1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ def makeTest(testParam) {
8
8
// Note: keyword source cannot be used in Jenkins script. Therefore, using "." instead.
9
9
String makeTestCmd = " $RESOLVED_MAKE ;cd ./aqa-tests; . ./scripts/testenv/testenvSettings.sh;cd ./TKG; \$ MAKE $testParam "
10
10
// unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
11
- if (JDK_IMPL == ' hotspot' && JDK_VERSION == ' 8 ' && PLATFORM . contains(' alpine-linux' )) {
11
+ if (JDK_IMPL == ' hotspot' && PLATFORM . contains(' alpine-linux' )) {
12
12
makeTestCmd = " unset LD_LIBRARY_PATH; $makeTestCmd "
13
13
}
14
14
try {
@@ -327,7 +327,7 @@ def setupParallelEnv() {
327
327
def genParallelList (PARALLEL_OPTIONS ) {
328
328
String unsetLLP = " "
329
329
// unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
330
- if (JDK_IMPL == ' hotspot' && JDK_VERSION == ' 8 ' && PLATFORM . contains(' alpine-linux' )) {
330
+ if (JDK_IMPL == ' hotspot' && PLATFORM . contains(' alpine-linux' )) {
331
331
unsetLLP = " unset LD_LIBRARY_PATH;"
332
332
}
333
333
sh " cd ./aqa-tests/TKG; ${ unsetLLP} make genParallelList ${ PARALLEL_OPTIONS} "
@@ -620,7 +620,7 @@ def get_sources() {
620
620
def makeCompileTest (){
621
621
String makeTestCmd = " bash ./compile.sh"
622
622
// unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
623
- if (JDK_IMPL == ' hotspot' && JDK_VERSION == ' 8 ' && PLATFORM . contains(' alpine-linux' )) {
623
+ if (JDK_IMPL == ' hotspot' && PLATFORM . contains(' alpine-linux' )) {
624
624
makeTestCmd = " unset LD_LIBRARY_PATH; $makeTestCmd "
625
625
}
626
626
dir(' aqa-tests' ) {
You can’t perform that action at this time.
0 commit comments