Author: rhs
Date: Fri Jul 17 11:53:43 2009
New Revision: 795056
URL: http://svn.apache.org/viewvc?rev=795056&view=rev
Log:
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
Modified:
qpid/trunk/qpid/java/management/client/build.xml
qpid/trunk/qpid/java/module.xml
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile
qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile
qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile
qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile
qpid/trunk/qpid/java/test-profiles/cpp.testprofile
Modified: qpid/trunk/qpid/java/management/client/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/client/build.xml?rev=795056&r1=795055&r2=795056&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/client/build.xml (original)
+++ qpid/trunk/qpid/java/management/client/build.xml Fri Jul 17 11:53:43 2009
@@ -180,7 +180,7 @@
<target name="test" depends="build,compile-tests"
if="module.test.src.exists" unless="${dontruntest}" description="execute unit
tests">
<delete file="${module.failed}"/>
- <echo message="Using config:${config}" level="info"/>
+ <echo message="Using profile:${profile}" level="info"/>
<junit fork="${test.fork}" maxmemory="1024M" reloading="no"
haltonfailure="${haltonfailure}"
haltonerror="${haltonerror}"
failureproperty="test.failures" printsummary="on"
timeout="600000" >
Modified: qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=795056&r1=795055&r2=795056&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Fri Jul 17 11:53:43 2009
@@ -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" >
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=795056&r1=795055&r2=795056&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Fri Jul 17 11:53:43 2009
@@ -344,19 +344,11 @@
private String getBrokerCommand(int port) throws MalformedURLException
{
- if (_brokerLanguage.equals(JAVA))
- {
- return _broker
- .replace("@PORT", "" + port)
- .replace("@MPORT", "" + (port + (8999 - DEFAULT_PORT)))
- .replace("@CONFIG_FILE", _configFile.toString());
- }
- else
- {
- return _broker
- .replace("@PORT", "" + port)
- .replace("@MPORT", "" + (port + (8999 - DEFAULT_PORT)));
- }
+ return _broker
+ .replace("@PORT", "" + port)
+ .replace("@SSL_PORT", "" + (port - 1))
+ .replace("@MPORT", "" + (port + (8999 - DEFAULT_PORT)))
+ .replace("@CONFIG_FILE", _configFile.toString());
}
public void startBroker(int port) throws Exception
Modified: qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile?rev=795056&r1=795055&r2=795056&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile Fri Jul 17
11:53:43 2009
@@ -1,3 +1,5 @@
-profile.inherit=cpp
-broker.modules=--load-module
${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so
+include=cpp
+
+broker.modules=--load-module ${broker.module.store}
+
test.excludesfile=${test.profiles}/ExcludeList
${test.profiles}/010ExcludeList-store
Modified: qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile?rev=795056&r1=795055&r2=795056&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile Fri Jul 17
11:53:43 2009
@@ -1,5 +1,7 @@
-profile.inherit=cpp
-broker.modules=--load-module ${project.root}/../cpp/src/.libs/cluster.so
--cluster-name cpp-java-test-cluster
+include=cpp
+
+broker.modules=--load-module ${broker.module.cluster} --cluster-name
cpp-java-test-cluster
+
test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList
${test.profiles}/010ExcludeList
profile.clustered=true
Modified: qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile?rev=795056&r1=795055&r2=795056&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile Fri Jul 17
11:53:43 2009
@@ -1,4 +1,3 @@
-profile.inherit=cpp
-broker.modules=--load-module
${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so
+include=cpp cpp.async
test.excludesfile=${test.profiles}/ExcludeList
${test.profiles}/010ExcludeList-noPrefetch
max_prefetch=0
Modified: qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile?rev=795056&r1=795055&r2=795056&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile Fri Jul 17 11:53:43
2009
@@ -1,7 +1,10 @@
-profile.inherit=cpp
-broker.modules=--load-module ${project.root}/../cpp/src/.libs/ssl.so
--ssl-cert-name localhost.localdomain --ssl-cert-password-file
${test.profiles}/test_resources/ssl/pfile --ssl-cert-db
${test.profiles}/test_resources/ssl/server_db/
--ssl-require-client-authentication
+include=cpp
+
+broker.modules=--load-module ${broker.module.ssl} --ssl-cert-name
localhost.localdomain --ssl-cert-password-file
${test.profiles}/test_resources/ssl/pfile --ssl-cert-db
${test.profiles}/test_resources/ssl/server_db/
--ssl-require-client-authentication --ssl-port @SSL_PORT
+
test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList
${test.profiles}/010ExcludeList-ssl
test.excludeslist=org.apache.qpid.test.client.failover.FailoverTest#*
+
profile.use_ssl=true
broker.ready= Listening for SSL connections
Modified: qpid/trunk/qpid/java/test-profiles/cpp.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.testprofile?rev=795056&r1=795055&r2=795056&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.testprofile Fri Jul 17 11:53:43 2009
@@ -1,6 +1,17 @@
broker.version=0-10
-broker.command=${project.root}/../cpp/src/qpidd
+
+broker.dir=${project.root}/../cpp/src
+module.dir=${broker.dir}/.libs
+store.dir=${project.root}/../../cppStore/cpp/lib/.libs
+
+broker.executable=${broker.dir}/qpidd
+broker.module.ssl=${module.dir}/ssl.so
+broker.module.cluster=${module.dir}/cluster.so
+broker.module.store=${store.dir}/msgstore.so
+
broker.modules=
broker.args=
-broker=${broker.command} -p @PORT --data-dir ${build.data}/@PORT -t --auth no
--no-module-dir ${broker.modules} ${broker.args}
+
+broker=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth
no --no-module-dir ${broker.modules} ${broker.args}
+
test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
