You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by an...@apache.org on 2013/02/19 00:48:52 UTC
svn commit: r1447559 - in /ant/core/trunk/src:
etc/testcases/taskdefs/manifestclasspath.xml
tests/junit/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java
Author: antoine
Date: Mon Feb 18 23:48:51 2013
New Revision: 1447559
URL: http://svn.apache.org/r1447559
Log:
fix error in testDifferentDrive under Windows @ jetbrains
Modified:
ant/core/trunk/src/etc/testcases/taskdefs/manifestclasspath.xml
ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java
Modified: ant/core/trunk/src/etc/testcases/taskdefs/manifestclasspath.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/etc/testcases/taskdefs/manifestclasspath.xml?rev=1447559&r1=1447558&r2=1447559&view=diff
==============================================================================
--- ant/core/trunk/src/etc/testcases/taskdefs/manifestclasspath.xml (original)
+++ ant/core/trunk/src/etc/testcases/taskdefs/manifestclasspath.xml Mon Feb 18 23:48:51 2013
@@ -229,10 +229,11 @@
<target name="testDifferentDrive">
<property name="temp" location="${java.io.tmpdir}"/>
+ <!-- the property altDriveLetter gets defined in Java -->
<manifestclasspath jarfile="${temp}\e.jar"
maxParentLevels="99" property="cp">
<classpath>
- <pathelement location="D:\a\b\x.jar"/>
+ <pathelement location="${altDriveLetter}:\a\b\x.jar"/>
</classpath>
</manifestclasspath>
</target>
Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java?rev=1447559&r1=1447558&r2=1447559&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java Mon Feb 18 23:48:51 2013
@@ -194,7 +194,7 @@ public class ManifestClassPathTest
+ " skipping test");
return;
}
-
+ project.setProperty("altDriveLetter", altDriveLetter);
expectBuildExceptionContaining("testDifferentDrive",
"different drive",
"No suitable relative path from ");