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

[ritchiem]

Author: ritchiem
Date: Fri Nov  7 09:42:17 2008
New Revision: 712206

URL: http://svn.apache.org/viewvc?rev=712206&view=rev
Log:
QPID-1439 : Revert change but add ability to track what test started the broker 
to aid in problem diagnosis

Modified:
    incubator/qpid/trunk/qpid/java/default.testprofile
    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/default.testprofile
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/default.testprofile?rev=712206&r1=712205&r2=712206&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/default.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/default.testprofile Fri Nov  7 09:42:17 2008
@@ -1,7 +1,6 @@
 broker.version=0-8
 broker=vm
 broker.clean=${project.root}/clean-dir ${build.data}
-broker.work=${build.results}/work/broker
 broker.ready=Listening on TCP port
 
 java.naming.provider.url=${project.root}/test-provider.properties

Modified: incubator/qpid/trunk/qpid/java/module.xml
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=712206&r1=712205&r2=712206&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Fri Nov  7 09:42:17 2008
@@ -147,7 +147,6 @@
     <mkdir dir="${build.lib}"/>
     <mkdir dir="${build.results}"/>
     <mkdir dir="${build.data}"/>
-    <mkdir dir="${broker.work}"/>
     <mkdir dir="${build.plugins}"/>
     <mkdir dir="${module.classes}"/>
     <mkdir dir="${module.precompiled}"/>
@@ -246,7 +245,6 @@
       <sysproperty key="example.plugin.target" 
value="${project.root}/build/lib/plugins"/>
       <sysproperty key="QPID_EXAMPLE_HOME" value="${project.root}/build"/>
       <sysproperty key="QPID_HOME" value="${project.root}/build"/>
-      <sysproperty key="QPID_WORK" value="${broker.work}"/>
 
       <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=712206&r1=712205&r2=712206&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
 Fri Nov  7 09:42:17 2008
@@ -349,9 +349,8 @@
             //Augment Path with bin directory in QPID_HOME.
             env.put("PATH", env.get("PATH").concat(File.pathSeparator + 
qpidHome + "/bin"));
 
-            //Set QPID_WORK on a per test basis to maintain broker logs.
-            String qpidWork = System.getProperty("QPID_WORK");
-            env.put("QPID_WORK",  qpidWork + File.separator + _testName );
+            //Add the test name to the broker run.
+            env.put("QPID_PNAME", "-DPNAME=\"" + _testName + "\"");
 
             process = pb.start();