Author: antoine
Date: Mon Mar 4 00:09:32 2013
New Revision: 1452156
URL: http://svn.apache.org/r1452156
Log:
fixing a text which is not passing under MacOS with JDK 1.7
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java?rev=1452156&r1=1452155&r2=1452156&view=diff
==============================================================================
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
Mon Mar 4 00:09:32 2013
@@ -111,7 +111,7 @@ public class JavaEnvUtilsTest extends Te
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 {
