Use xlc16 for running JCK tests on AIX (#3194)

* change xlc to v16 * Increase jck.timeout.timeout to 10 Signed-off-by: Stewart X Addison <[email protected]> * Adjust timeout in JavaTestRunner.java too Signed-off-by: Stewart X Addison <[email protected]> Co-authored-by: Adam Farley <[email protected]>
adoptium · Jan 14, 2022 · 2a603d3 · 2a603d3
1 parent f896223
commit 2a603d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/jck/jtrunner/JavaTestRunner.java b/jck/jtrunner/JavaTestRunner.java
@@ -775,7 +775,7 @@ public static boolean jckConfigurationForMultijvmWithNoAgent() throws Exception
 			}
 
 			fileContent += "concurrency " + concurrencyString + ";\n";
-			fileContent += "timeoutfactor 4" + ";\n";							// All Devtools tests take less than 1h to finish.
+			fileContent += "timeoutfactor 40" + ";\n";							// All Devtools tests take less than 1h to finish.
 
 			if (platform.equals("win")) {
 				// On Windows set the testplatform.os to Windows and set systemRoot, but do not

diff --git a/jck/jtrunner/config/jck8c/runtime.jti b/jck/jtrunner/config/jck8c/runtime.jti
@@ -232,4 +232,4 @@ jck.priorStatus.status=
 jck.tests.needTests=No
 jck.tests.tests=
 jck.tests.treeOrFile=tree
-jck.timeout.timeout=1
+jck.timeout.timeout=10
diff --git a/jck/jtrunner/makefile b/jck/jtrunner/makefile
@@ -167,7 +167,7 @@ ifeq ($(OS),sunos)
 endif
 
 ifeq ($(OS),aix)
-	CC=/opt/IBM/xlC/13.1.3/bin/xlc
+	CC=/opt/IBM/xlC/16.1.0/bin/xlc
 	CFLAGS=-qstaticinline -q$(BitMode) -I$(UNIX_PATH) -I$(OSX_PATH) -I$(SRC_PATH)
 	LDFLAGS=-G -q$(BitMode)
 endif