From 98c58cce294009c64ca1580d2969c582b19b215d Mon Sep 17 00:00:00 2001
From: "Rafael H. Schloming" <rhs@apache.org>
Date: Fri, 17 Jul 2009 11:53:43 +0000
Subject: added system properties for controlling the module locations used
 during test runs; concat all the profile properties together before loading
 so that more can be shared between profiles; added an @SSL_PORT to the
 substitutions done by QpidTestCase

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@795056 13f79535-47bb-0310-9956-ffa450edef68
---
 java/module.xml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'java/module.xml')

diff --git a/java/module.xml b/java/module.xml
index 1bfc1931a4..5d0c0a9541 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -222,19 +222,23 @@
     </copy>
   </target>
 
-  <condition property="config" value="${profile}.testprofile" else="default.testprofile">
-    <and>
-      <isset property="profile"/>
-      <available file="${test.profiles}/${profile}.testprofile" type="file"/>
-    </and>
-  </condition>
 
+  <property name="profile" value="default"/>
+  <property file="${test.profiles}/${profile}.testprofile" prefix="preload"/>
+  <property name="preload.include" value=""/>
+  <condition property="profiles"
+             value="${preload.include} ${profile}"
+             else="default ${preload.include} ${profile}">
+    <equals arg1="${profile}" arg2="default"/>
+  </condition>
+  <map property="_profile_files" value="${profiles}" join=" ">
+    <globmapper from="*" to="*.testprofile"/>
+  </map>
+  <concat destfile="${build.scratch}/test-${profile}.properties" force="no" fixlastline="yes">
+    <filelist dir="${test.profiles}" files="${_profile_files}"/>
+  </concat>
+  <property file="${build.scratch}/test-${profile}.properties"/>
 
-  <property file="${test.profiles}/${config}"/>
-  <foreach property="_profile_" list="${profile.inherit}">
-    <property file="${test.profiles}/${_profile_}.testprofile"/>
-  </foreach>
-  <property file="${test.profiles}/default.testprofile"/>
 
   <condition property="dontruntest" value="dontruntest" else="runtest">
          <contains substring="${module.name}" string="${exclude.modules}" />
@@ -245,7 +249,7 @@
 
     <delete file="${module.failed}"/>
 
-    <echo message="Using config:${config}" level="info"/>
+    <echo message="Using profile:${profile}" level="info"/>
     <junit fork="${test.fork}" maxmemory="${test.mem}" reloading="no"
            haltonfailure="${haltonfailure}" haltonerror="${haltonerror}"
            failureproperty="test.failures" printsummary="on" timeout="600000" >
-- 
cgit v1.2.1