From 57dc9c9d02aa1ea5bd1f98aa9bca1f832b5a8edc Mon Sep 17 00:00:00 2001 From: Pasam Soujanya Date: Thu, 16 Jan 2025 13:59:57 +0530 Subject: [PATCH 1/4] Create parallelList.mk in ebcdic for JDK21 on z/OS --- src/org/testKitGen/TestDivider.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/org/testKitGen/TestDivider.java b/src/org/testKitGen/TestDivider.java index 4fcb4078..e1346928 100644 --- a/src/org/testKitGen/TestDivider.java +++ b/src/org/testKitGen/TestDivider.java @@ -15,7 +15,6 @@ package org.testKitGen; import java.io.FileFilter; -import java.io.FileWriter; import java.io.IOException; import java.io.File; import java.util.*; @@ -25,13 +24,18 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.FileReader; +import java.io.Writer; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; +import org.openj9.envInfo.JavaInfo; +import org.openj9.envInfo.Utility; + public class TestDivider { private Arguments arg; + private JavaInfo jInfo; private TestTarget tt; private List testsToExecute; private List testsToDisplay; @@ -41,6 +45,7 @@ public class TestDivider { public TestDivider(Arguments arg, TestTarget tt) { this.arg = arg; + this.jInfo = new JavaInfo(); this.tt = tt; testsToExecute = TestInfo.getTestsToExecute(); testsToDisplay = TestInfo.getTestsToDisplay(); @@ -350,7 +355,7 @@ private String formatTime(int milliSec) { private void writeParallelmk(List> parallelLists) { try { - FileWriter f = new FileWriter(parallelmk); + Writer f = Utility.getWriterObject(jInfo.getJDKVersion(), arg.getSpec(),parallelmk); f.write(Constants.HEADERCOMMENTS); f.write("NUM_LIST=" + parallelLists.size() + "\n\n"); for (int i = 0; i < parallelLists.size(); i++) { From a03303006467d6b53b5664e19d71439de2992461 Mon Sep 17 00:00:00 2001 From: Pasam Soujanya Date: Thu, 16 Jan 2025 14:43:24 +0530 Subject: [PATCH 2/4] Create buildInfo.mk in ebcdic for JDK21 on z/OS --- src/org/testKitGen/BuildList.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/org/testKitGen/BuildList.java b/src/org/testKitGen/BuildList.java index 8ee74496..751ec183 100644 --- a/src/org/testKitGen/BuildList.java +++ b/src/org/testKitGen/BuildList.java @@ -15,21 +15,26 @@ package org.testKitGen; import java.io.File; -import java.io.FileWriter; import java.io.IOException; +import java.io.Writer; import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashSet; import java.util.Set; +import org.openj9.envInfo.JavaInfo; +import org.openj9.envInfo.Utility; + public class BuildList { private Arguments arg; + private JavaInfo jInfo; private Set originalSet = new HashSet<>(); private Set newSet = new HashSet<>(); private String buildInfomk; public BuildList(Arguments arg) { this.arg = arg; + this.jInfo = new JavaInfo(); buildInfomk = arg.getProjectRootDir() + "/TKG/" + Constants.BUILDINFOMK; initializeSet(); } @@ -92,7 +97,7 @@ private String getStr() { } public void generateList() { - try (FileWriter f = new FileWriter(buildInfomk)) { + try (Writer f = Utility.getWriterObject(jInfo.getJDKVersion(), arg.getSpec(), buildInfomk)) { f.write(Constants.HEADERCOMMENTS); f.write("REFINED_BUILD_LIST := " + getStr() + "\n"); System.out.println("Generated " + buildInfomk + "\n"); From 2d9d8d83cd94e8dfda78c49519b7e4cb263a6da9 Mon Sep 17 00:00:00 2001 From: Pasam Soujanya Date: Thu, 12 Dec 2024 16:28:42 +0530 Subject: [PATCH 3/4] Remove IBM-1047 export option and generate makefiles in IBM-1047 encoding for JDK21 on z/OS --- src/org/testKitGen/ModesDictionary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/testKitGen/ModesDictionary.java b/src/org/testKitGen/ModesDictionary.java index 166cf28a..3595c65d 100644 --- a/src/org/testKitGen/ModesDictionary.java +++ b/src/org/testKitGen/ModesDictionary.java @@ -101,7 +101,7 @@ private void parseInvalidSpec(Element modes) throws IOException { ArrayList specs = new ArrayList(); int lineNum = 0; BufferedReader reader = null; - if (arg.getSpec().toLowerCase().contains("zos") && !(jInfo.getJDKVersion() >= 21)) { + if (arg.getSpec().toLowerCase().contains("zos") && !(arg.getJdkVersion().matches("[2-9][0-9]"))) { reader = Files.newBufferedReader(Paths.get(ottawaCsv), Charset.forName("IBM-1047")); } else { reader = Files.newBufferedReader(Paths.get(ottawaCsv)); From 7b4c4818267f0fdd9d84c1301faa432148093894 Mon Sep 17 00:00:00 2001 From: Pasam Soujanya Date: Tue, 17 Dec 2024 09:43:07 +0530 Subject: [PATCH 4/4] Remove using IBM_JAVA_OPTIONS --- src/org/testKitGen/ModesDictionary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/testKitGen/ModesDictionary.java b/src/org/testKitGen/ModesDictionary.java index 3595c65d..166cf28a 100644 --- a/src/org/testKitGen/ModesDictionary.java +++ b/src/org/testKitGen/ModesDictionary.java @@ -101,7 +101,7 @@ private void parseInvalidSpec(Element modes) throws IOException { ArrayList specs = new ArrayList(); int lineNum = 0; BufferedReader reader = null; - if (arg.getSpec().toLowerCase().contains("zos") && !(arg.getJdkVersion().matches("[2-9][0-9]"))) { + if (arg.getSpec().toLowerCase().contains("zos") && !(jInfo.getJDKVersion() >= 21)) { reader = Files.newBufferedReader(Paths.get(ottawaCsv), Charset.forName("IBM-1047")); } else { reader = Files.newBufferedReader(Paths.get(ottawaCsv));