Browse Source

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


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275122 13f79535-47bb-0310-9956-ffa450edef68
master
Antoine Levy-Lambert 22 years ago
parent
commit
9361cdab83
2 changed files with 5 additions and 5 deletions
  1. +4
    -4
      src/etc/testcases/taskdefs/java.xml
  2. +1
    -1
      src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java

+ 4
- 4
src/etc/testcases/taskdefs/java.xml View File

@@ -45,7 +45,7 @@
<java classname="${app}" <java classname="${app}"
classpath="${tests-classpath.value}" classpath="${tests-classpath.value}"
> >
<arg value="-1"/>
<arg value="2"/>
</java> </java>
</target> </target>


@@ -53,7 +53,7 @@
<java classname="${app}" <java classname="${app}"
classpath="${tests-classpath.value}" classpath="${tests-classpath.value}"
failonerror="true"> failonerror="true">
<arg value="-1"/>
<arg value="2"/>
</java> </java>
</target> </target>


@@ -62,7 +62,7 @@
classpath="${tests-classpath.value}" classpath="${tests-classpath.value}"
failonerror="true" failonerror="true"
fork="true"> fork="true">
<arg value="-1"/>
<arg value="2"/>
</java> </java>
</target> </target>


@@ -111,7 +111,7 @@
failonerror="false" failonerror="false"
fork="true" fork="true"
> >
<arg value="-1"/>
<arg value="2"/>
</java> </java>
<echo message="exitcode = ${exitcode}"/> <echo message="exitcode = ${exitcode}"/>
</target> </target>


+ 1
- 1
src/testcases/org/apache/tools/ant/taskdefs/JavaTest.java View File

@@ -182,7 +182,7 @@ public class JavaTest extends BuildFileTest {


public void testResultPropertyNonZero() { public void testResultPropertyNonZero() {
executeTarget("testResultPropertyNonZero"); executeTarget("testResultPropertyNonZero");
assertEquals("-1",project.getProperty("exitcode"));
assertEquals("2",project.getProperty("exitcode"));
} }


public void testSpawn() { public void testSpawn() {


Loading…
Cancel
Save