[jboss-cvs] JBossAS SVN: r62059 - branches/Branch_4_2/testsuite/src/main/org/jboss/test/util/test.

[jboss-cvs-commits at lists.jboss.org]

Author: stan.silvert at jboss.com
Date: 2007-04-03 18:41:35 -0400 (Tue, 03 Apr 2007)
New Revision: 62059

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/util/test/TwiddleUnitTestCase.java
Log:
JBAS-3726 Programatically add JBOSS_HOME to execution environment.


Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/util/test/TwiddleUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/util/test/TwiddleUnitTestCase.java	2007-04-03 22:40:40 UTC (rev 62058)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/util/test/TwiddleUnitTestCase.java	2007-04-03 22:41:35 UTC (rev 62059)
@@ -107,6 +107,7 @@
 
      ProcessBuilder builder = new ProcessBuilder(command);
      builder.directory(getTwiddleWorkingDir());
+     builder.environment().put("JBOSS_HOME", getJBossHome());
      Process proc = builder.start();
      StringBuilder buffer = readStream(proc.getInputStream());
 
@@ -162,13 +163,18 @@
      return System.getProperty("os.name").toLowerCase().startsWith("windows");
   }
 
-  protected File getTwiddleWorkingDir()
+  protected String getJBossHome()
   {
      // usually, the jboss.dist system property is set in the ant <junit> task using
      // <sysproperty key="jboss.dist" value="${jboss.dist}"/>
      String jbossDist = System.getProperty("jboss.dist");
      if (jbossDist == null) throw new IllegalStateException("jboss.dist System property is not set");
-     String jbossBin = jbossDist + "/bin";
+     return jbossDist;
+  }
+
+  protected File getTwiddleWorkingDir()
+  {
+     String jbossBin = getJBossHome() + "/bin";
      log.debug("Twiddle working dir = " + jbossBin);
      return new File(jbossBin);
   }