Author: michiel
Date: 2009-09-08 17:27:14 +0200 (Tue, 08 Sep 2009)
New Revision: 38511
Modified:
mmbase/trunk/core/src/test/java/org/mmbase/util/externalprocess/CommandExecutorTest.java
Log:
michiel: support for JAVA_HOME environment setting
Modified:
mmbase/trunk/core/src/test/java/org/mmbase/util/externalprocess/CommandExecutorTest.java
===================================================================
---
mmbase/trunk/core/src/test/java/org/mmbase/util/externalprocess/CommandExecutorTest.java
2009-09-08 15:23:19 UTC (rev 38510)
+++
mmbase/trunk/core/src/test/java/org/mmbase/util/externalprocess/CommandExecutorTest.java
2009-09-08 15:27:14 UTC (rev 38511)
@@ -19,11 +19,17 @@
public class CommandExecutorTest {
+ String getJava() {
+ String java_home = System.getenv("JAVA_HOME");
+ return java_home == null ? "java" : java_home + File.separator + "bin"
+ File.separator + "java";
+ }
+
+
@Test
public void stdout() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ByteArrayOutputStream err = new ByteArrayOutputStream();
- CommandExecutor.execute(out, err, new CommandExecutor.Method(),
"java", "-cp", "target" + File.separator + "test-classes",
CommandExecutorTest.class.getName(), "stdout", "hello");
+ CommandExecutor.execute(out, err, new CommandExecutor.Method(),
getJava(), "-cp", "target" + File.separator + "test-classes",
CommandExecutorTest.class.getName(), "stdout", "hello");
assertEquals("hello", out.toString().trim());
assertEquals("", err.toString());
}
@@ -31,7 +37,7 @@
public void stderr() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ByteArrayOutputStream err = new ByteArrayOutputStream();
- CommandExecutor.execute(out, err, new CommandExecutor.Method(),
"java", "-cp", "target" + File.separator + "test-classes",
CommandExecutorTest.class.getName(), "stderr", "hello");
+ CommandExecutor.execute(out, err, new CommandExecutor.Method(),
getJava(), "-cp", "target" + File.separator + "test-classes",
CommandExecutorTest.class.getName(), "stderr", "hello");
assertEquals("", out.toString().trim());
assertEquals("hello", err.toString().trim());
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
