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

Jump to bottom

Incorrect detection of solaris in JavatestUtil.java #4666

Merged
merged 2 commits into from
Jul 12, 2023
Merged

Incorrect detection of solaris in JavatestUtil.java #4666

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0581577
Fix Solaris natives path for jck testing
sxa Jul 11, 2023
74f66b8
Fix jck/solaris spec test in JavatestUtil.java
sxa Jul 11, 2023
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
4 changes: 2 additions & 2 deletions jck/jtrunner/JavatestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public static void main(String args[]) throws Exception {
secPropsFile = workDir + File.separator + "security.properties";

// Solaris natives are in /natives/sunos
if (spec.contains("solaris")) {
if (spec.contains("sunos")) {
nativesLoc = jckRoot + File.separator + "natives" + File.separator + "sunos";
}

Expand Down Expand Up @@ -787,7 +787,7 @@ private static boolean generateJTB() throws Exception {
jxcCmd = jckBase + File.separator + "macos" + File.separator + "bin" + File.separator + "schemagen.sh";
genCmd = jckBase + File.separator + "macos" + File.separator + "bin" + File.separator + "wsgen.sh";
impCmd = jckBase + File.separator + "macos" + File.separator + "bin" + File.separator + "wsimport.sh";
} else if (spec.contains("zos") || spec.contains("solaris")) {
} else if (spec.contains("zos") || spec.contains("sunos")) {
pathToJavac = testJdk + File.separator + "bin" + File.separator + "javac";
xjcCmd = jckBase + File.separator + "solaris" + File.separator + "bin" + File.separator + "xjc.sh";
jxcCmd = jckBase + File.separator + "solaris" + File.separator + "bin" + File.separator + "schemagen.sh";
Expand Down