ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r1452156 - /ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
Date Mon, 04 Mar 2013 00:09:32 GMT
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 {



Mime
View raw message