From 9dc608c2456228b0fecfbc3afea0388f74354862 Mon Sep 17 00:00:00 2001 From: Antoine Levy-Lambert Date: Mon, 4 Mar 2013 00:09:32 +0000 Subject: [PATCH] fixing a text which is not passing under MacOS with JDK 1.7 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1452156 13f79535-47bb-0310-9956-ffa450edef68 --- src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2c25fc26b..8172bd991 100644 --- a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java @@ -111,7 +111,7 @@ public class JavaEnvUtilsTest extends TestCase { assertTrue(j+" is normalized and in the JDK dir", j.startsWith(javaHomeParent)); - if (Os.isFamily("mac")) { + if (Os.isFamily("mac") && JavaEnvUtils.getJavaVersionNumber() <= JavaEnvUtils.VERSION_1_6) { assertTrue(j+" is normalized and in the JRE dir", j.startsWith(javaHome)); } else {