mbenson 2005/03/01 13:26:34
Modified: src/testcases/org/apache/tools/ant/taskdefs
ExecuteJavaTest.java
Log:
Disable test that can't run under Windows Java 1.2 . Should check 1.3 as well.
Revision Changes Path
1.11 +7 -0
ant/src/testcases/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java
Index: ExecuteJavaTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ExecuteJavaTest.java 24 Feb 2005 22:39:27 -0000 1.10
+++ ExecuteJavaTest.java 1 Mar 2005 21:26:34 -0000 1.11
@@ -20,6 +20,7 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.taskdefs.condition.Os;
import org.apache.tools.ant.util.JavaEnvUtils;
import java.io.File;
@@ -97,6 +98,12 @@
// test that the watchdog ends the process
public void testTimeOutForked() throws Exception {
+ //process doesn't die properly under this combination,
+ //thus test fails. No workaround?
+ if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2)
+ && Os.isFamily("dos")) {
+ return;
+ }
Commandline cmd = getCommandline(TIME_OUT*2);
ej.setJavaCommand(cmd);
long now = System.currentTimeMillis();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
