Browse Source

Disable test that can't run under Windows Java 1.2 . Should check 1.3 as well.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277757 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 20 years ago
parent
commit
172370143a
1 changed files with 7 additions and 0 deletions
  1. +7
    -0
      src/testcases/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java

+ 7
- 0
src/testcases/org/apache/tools/ant/taskdefs/ExecuteJavaTest.java View File

@@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.Project; import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.taskdefs.condition.Os;
import org.apache.tools.ant.util.JavaEnvUtils; import org.apache.tools.ant.util.JavaEnvUtils;


import java.io.File; import java.io.File;
@@ -97,6 +98,12 @@ public class ExecuteJavaTest extends TestCase {


// test that the watchdog ends the process // test that the watchdog ends the process
public void testTimeOutForked() throws Exception { 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); Commandline cmd = getCommandline(TIME_OUT*2);
ej.setJavaCommand(cmd); ej.setJavaCommand(cmd);
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();


Loading…
Cancel
Save