svn commit: r680942 - in /incubator/qpid/trunk/qpid/java: module.xml systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java

[ri...@apache.org]

Author: ritchiem
Date: Wed Jul 30 01:48:38 2008
New Revision: 680942

URL: http://svn.apache.org/viewvc?rev=680942&view=rev
Log:
Update QpidTestCase to add /bin to the path for the external broker

Modified:
    incubator/qpid/trunk/qpid/java/module.xml
    incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java

Modified: incubator/qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=680942&r1=680941&r2=680942&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Wed Jul 30 01:48:38 2008
@@ -227,8 +227,8 @@
       <sysproperty key="test.output" value="${module.results}"/>
       <sysproperty key="max_prefetch" value ="${max_prefetch}"/>
       <sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/>
-      <sysproperty key="QPID_EXAMPLE_HOME" value="${project.root}/broker"/>
-      <sysproperty key="QPID_HOME" value="${project.root}/broker"/>
+      <sysproperty key="QPID_EXAMPLE_HOME" value="${project.root}/build"/>
+      <sysproperty key="QPID_HOME" value="${project.root}/build"/>
 
       <formatter type="plain"/>
       <formatter type="xml"/>

Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=680942&r1=680941&r2=680942&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Wed Jul 30 01:48:38 2008
@@ -26,8 +26,8 @@
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Properties;
 import java.util.StringTokenizer;
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -48,7 +48,7 @@
 
     private static final Logger _logger = LoggerFactory.getLogger(QpidTestCase.class);
 
-    protected long RECEIVE_TIMEOUT = 1000l;    
+    protected long RECEIVE_TIMEOUT = 1000l;
 
     /**
      * Some tests are excluded when the property test.excludes is set to true.
@@ -129,6 +129,8 @@
     private static final String VERSION_08 = "0-8";
     private static final String VERSION_010 = "0-10";
 
+    private static final String QPID_HOME = "QPID_HOME";
+
     protected String _broker = System.getProperty(BROKER, VM);
     private String _brokerClean = System.getProperty(BROKER_CLEAN, null);
     private String _brokerVersion = System.getProperty(BROKER_VERSION, VERSION_08);
@@ -171,7 +173,6 @@
             System.setErr(err);
         }
 
-
         _logger.info("========== start " + name + " ==========");
         startBroker();
         try
@@ -293,6 +294,15 @@
             _logger.info("starting broker: " + _broker);
             ProcessBuilder pb = new ProcessBuilder(_broker.split("\\s+"));
             pb.redirectErrorStream(true);
+
+            Map<String, String> env = pb.environment();
+
+            String qpidHome = System.getProperty(QPID_HOME);
+            env.put(QPID_HOME, qpidHome);
+
+            //Augment Path with bin directory in QPID_HOME.
+            env.put("PATH", env.get("PATH").concat(File.pathSeparator + qpidHome + "/bin"));
+
             _brokerProcess = pb.start();
 
             Piper p = new Piper(_brokerProcess.getInputStream(),