antoine 2003/08/21 11:00:41
Modified: src/etc/testcases/taskdefs java.xml
src/testcases/org/apache/tools/ant/taskdefs JavaTest.java
Log:
Make JavaTest pass under JDK 1.2 (and 1.3) under linux
The same problem was seen on JDK 1.3 on FreeBSD
PR: 22549
Submitted by: J.M. (Martijn) Kruithof ant at kruithof dot xs4all dot nl
Revision Changes Path
1.8 +4 -4 ant/src/etc/testcases/taskdefs/java.xml
Index: java.xml
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/java.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- java.xml 30 Jul 2003 15:25:51 -0000 1.7
+++ java.xml 21 Aug 2003 18:00:41 -0000 1.8
@@ -45,7 +45,7 @@
<java classname="${app}"
classpath="${tests-classpath.value}"
>
- <arg value="-1"/>
+ <arg value="2"/>
</java>
</target>
@@ -53,7 +53,7 @@
<java classname="${app}"
classpath="${tests-classpath.value}"
failonerror="true">
- <arg value="-1"/>
+ <arg value="2"/>
</java>
</target>
@@ -62,7 +62,7 @@
classpath="${tests-classpath.value}"
failonerror="true"
fork="true">
- <arg value="-1"/>
+ <arg value="2"/>
</java>
</target>
@@ -111,7 +111,7 @@
failonerror="false"
fork="true"
>
- <arg value="-1"/>
+ <arg value="2"/>
</java>
<echo message="exitcode = ${exitcode}"/>
</target>
1.13 +1 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java
Index: JavaTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JavaTest.java 30 Jul 2003 15:25:51 -0000 1.12
+++ JavaTest.java 21 Aug 2003 18:00:41 -0000 1.13
@@ -182,7 +182,7 @@
public void testResultPropertyNonZero() {
executeTarget("testResultPropertyNonZero");
- assertEquals("-1",project.getProperty("exitcode"));
+ assertEquals("2",project.getProperty("exitcode"));
}
public void testSpawn() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
