From 67c9b6f10b155d74cf6ef69a49fb55a65af4dcde Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Sun, 20 May 2012 21:59:30 +0000
Subject: 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/qpid@1340855 13f79535-47bb-0310-9956-ffa450edef68
---
 java/perftests/build.xml | 6 ++++++
 java/systests/build.xml  | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'java')

diff --git a/java/perftests/build.xml b/java/perftests/build.xml
index 0508219a49..63a6ea4983 100644
--- a/java/perftests/build.xml
+++ b/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/java/systests/build.xml b/java/systests/build.xml
index 88fe58140c..57337bdc55 100644
--- a/java/systests/build.xml
+++ b/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}"/>
-- 
cgit v1.2.1