Browse Source

javac *is* inside the JRE dir from Java9 onwards

or so they say
master
Stefan Bodewig 10 years ago
parent
commit
06c4fc6096
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java

+ 2
- 1
src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java View File

@@ -115,7 +115,8 @@ public class JavaEnvUtilsTest {
assertTrue(j+" is normalized and in the JDK dir",
j.startsWith(javaHomeParent));

if (Os.isFamily("mac") && JavaEnvUtils.getJavaVersionNumber() <= JavaEnvUtils.VERSION_1_6) {
if ((Os.isFamily("mac") && JavaEnvUtils.getJavaVersionNumber() <= JavaEnvUtils.VERSION_1_6)
|| JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_9)) {
assertTrue(j+" is normalized and in the JRE dir",
j.startsWith(javaHome));
} else {


Loading…
Cancel
Save