Author: robbie
Date: Sun May 20 21:59:30 2012
New Revision: 1340855
URL: http://svn.apache.org/viewvc?rev=1340855&view=rev
Log:
QPID-3994: fix -Doptional=true enabling of the optional bdbstore dependency in
the systests/perftests
Modified:
qpid/trunk/qpid/java/perftests/build.xml
qpid/trunk/qpid/java/systests/build.xml
Modified: qpid/trunk/qpid/java/perftests/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/build.xml?rev=1340855&r1=1340854&r2=1340855&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/build.xml (original)
+++ qpid/trunk/qpid/java/perftests/build.xml Sun May 20 21:59:30 2012
@@ -20,10 +20,16 @@
-->
<project name="Performance Tests" default="build">
<condition property="perftests.optional.test.depends" value="bdbstore"
else="">
+ <or>
<and>
<contains string="${modules.opt}" substring="bdbstore"/>
<contains string="${profile}" substring="bdb"/>
</and>
+ <and>
+ <istrue value="${optional}"/>
+ <contains string="${profile}" substring="bdb"/>
+ </and>
+ </or>
</condition>
<property name="module.depends" value="client common"/>
Modified: qpid/trunk/qpid/java/systests/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/build.xml?rev=1340855&r1=1340854&r2=1340855&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/build.xml (original)
+++ qpid/trunk/qpid/java/systests/build.xml Sun May 20 21:59:30 2012
@@ -20,10 +20,16 @@ nn - or more contributor license agreeme
-->
<project name="System Tests" default="build">
<condition property="systests.optional.depends" value="bdbstore" else="">
+ <or>
<and>
<contains string="${modules.opt}" substring="bdbstore"/>
<contains string="${profile}" substring="bdb"/>
</and>
+ <and>
+ <istrue value="${optional}"/>
+ <contains string="${profile}" substring="bdb"/>
+ </and>
+ </or>
</condition>
<property name="module.depends" value="client management/common broker
broker/test common amqp-1-0-common common/test jca
${systests.optional.depends}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
