summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/perftests/build.xml6
-rw-r--r--qpid/java/systests/build.xml6
2 files changed, 12 insertions, 0 deletions
diff --git a/qpid/java/perftests/build.xml b/qpid/java/perftests/build.xml
index 0508219a49..63a6ea4983 100644
--- a/qpid/java/perftests/build.xml
+++ b/qpid/java/perftests/build.xml
@@ -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"/>
diff --git a/qpid/java/systests/build.xml b/qpid/java/systests/build.xml
index 88fe58140c..57337bdc55 100644
--- a/qpid/java/systests/build.xml
+++ b/qpid/java/systests/build.xml
@@ -20,10 +20,16 @@ nn - or more contributor license agreements. See the NOTICE file
-->
<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}"/>