diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-05-20 21:59:30 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-05-20 21:59:30 +0000 |
| commit | d259267a3a43fe7cb512aed8fd747cc9d4135954 (patch) | |
| tree | 3c8bee49c665ff6527da3132ecd576f0c5cb086c | |
| parent | 6d7405089db8359d001b3f9133e819f8d40c0a8a (diff) | |
| download | qpid-python-d259267a3a43fe7cb512aed8fd747cc9d4135954.tar.gz | |
QPID-3994: fix -Doptional=true enabling of the optional bdbstore dependency in the systests/perftests
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1340855 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/perftests/build.xml | 6 | ||||
| -rw-r--r-- | qpid/java/systests/build.xml | 6 |
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}"/> |