Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate parallelList and buildInfo makefiles in ebcdic for JDK21 on z/OS #660

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Generate parallelList and buildInfo makefiles in ebcdic for JDK21 on z/OS #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57dc9c9
Create parallelList.mk in ebcdic for JDK21 on z/OS
psoujany Jan 16, 2025
a033030
Create buildInfo.mk in ebcdic for JDK21 on z/OS
psoujany Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/org/testKitGen/BuildList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> originalSet = new HashSet<>();
private Set<String> newSet = new HashSet<>();
private String buildInfomk;

public BuildList(Arguments arg) {
this.arg = arg;
this.jInfo = new JavaInfo();
buildInfomk = arg.getProjectRootDir() + "/TKG/" + Constants.BUILDINFOMK;
initializeSet();
}
Expand Down Expand Up @@ -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");
Expand Down
9 changes: 7 additions & 2 deletions src/org/testKitGen/TestDivider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand All @@ -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<String> testsToExecute;
private List<String> testsToDisplay;
Expand All @@ -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();
Expand Down Expand Up @@ -350,7 +355,7 @@ private String formatTime(int milliSec) {

private void writeParallelmk(List<List<String>> 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++) {
Expand Down
Loading