conor 2003/01/27 05:49:41
Modified: src/testcases/org/apache/tools/ant/taskdefs
ExecuteWatchdogTest.java
src/main/org/apache/tools/ant/taskdefs/optional ANTLR.java
Log:
Allow tests (and tasks) to run when java is not in the path
PR: 15998
Revision Changes Path
1.12 +1 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
Index: ExecuteWatchdogTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -u -r1.11 -r1.12
--- ExecuteWatchdogTest.java 23 Apr 2002 10:30:12 -0000 1.11
+++ ExecuteWatchdogTest.java 27 Jan 2003 13:49:40 -0000 1.12
@@ -108,7 +108,7 @@
private Process getProcess(int timetorun) throws Exception {
String[] cmdArray = {
- "java", "-classpath", TEST_CLASSPATH,
+ JavaEnvUtils.getJdkExecutable("java"), "-classpath",
TEST_CLASSPATH,
TimeProcess.class.getName(), String.valueOf(timetorun)
};
//System.out.println("Testing with classpath: " +
System.getProperty("java.class.path"));
1.17 +2 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
Index: ANTLR.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -u -r1.16 -r1.17
--- ANTLR.java 30 Jul 2002 09:12:11 -0000 1.16
+++ ANTLR.java 27 Jan 2003 13:49:40 -0000 1.17
@@ -67,6 +67,7 @@
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.util.JavaEnvUtils;
/**
* Invokes the ANTLR Translator generator on a grammar file.
@@ -110,7 +111,7 @@
private File workingdir = null;
public ANTLR() {
- commandline.setVm("java");
+ commandline.setVm(JavaEnvUtils.getJdkExecutable("java"));
commandline.setClassname("antlr.Tool");
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
