You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2015/02/13 07:03:22 UTC

[2/2] ant git commit: javac *is* inside the JRE dir from Java9 onwards

javac *is* inside the JRE dir from Java9 onwards

or so they say


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/06c4fc60
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/06c4fc60
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/06c4fc60

Branch: refs/heads/master
Commit: 06c4fc609601c74559c164c6e79a70edcce53917
Parents: 89dc07d
Author: Stefan Bodewig <bo...@apache.org>
Authored: Fri Feb 13 07:01:39 2015 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Fri Feb 13 07:01:39 2015 +0100

----------------------------------------------------------------------
 src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/06c4fc60/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
index 21017cc..8bcb1f2 100644
--- a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
@@ -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 {