From d957fddf76678895ea65550295f1025e38cd66ea Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Mon, 27 Jan 2003 13:49:40 +0000 Subject: [PATCH] Allow tests (and tasks) to run when java is not in the path PR: 15998 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273891 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java | 3 ++- .../org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index f97a572b1..add82be07 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -67,6 +67,7 @@ import org.apache.tools.ant.taskdefs.LogStreamHandler; 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 @@ public class ANTLR extends Task { private File workingdir = null; public ANTLR() { - commandline.setVm("java"); + commandline.setVm(JavaEnvUtils.getJdkExecutable("java")); commandline.setClassname("antlr.Tool"); } diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java index 913bbc2e5..aab1a69a9 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java @@ -108,7 +108,7 @@ public class ExecuteWatchdogTest extends TestCase { 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"));