From 373d8fc7bbcb2f586d6f07c93f2ad6c0ec260cbd Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Fri, 7 Nov 2008 17:42:17 +0000
Subject: QPID-1439 : Revert change but add ability to track what test started
 the broker to aid in problem diagnosis

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@712206 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/default.testprofile                                        | 1 -
 qpid/java/module.xml                                                 | 2 --
 .../src/main/java/org/apache/qpid/test/utils/QpidTestCase.java       | 5 ++---
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/default.testprofile b/qpid/java/default.testprofile
index 825a112571..46c3f7746a 100644
--- a/qpid/java/default.testprofile
+++ b/qpid/java/default.testprofile
@@ -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
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 0376a26f2c..c487ffb134 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -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"/>
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index 7bf61365ce..085578c13d 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -349,9 +349,8 @@ public class QpidTestCase extends TestCase
             //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();
 
-- 
cgit v1.2.1