QPID-1037: Added module name prop and an exclude.modules prop + switch systests off in cpp profiles.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@654505 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 17 insertions, 7 deletions

diff --git a/java/broker-plugins/build.xml b/java/broker-plugins/build.xml
index 9787eeebc3..9e02e341b3 100644
--- a/java/broker-plugins/build.xml
+++ b/java/broker-plugins/build.xml
@@ -19,7 +19,7 @@ nn - or more contributor license agreements.  See the NOTICE file
  -
  -->
 <project name="AMQ Broker-Plugins" default="build">
-
+    <property name="module.name" value="broker-plugins"/>
     <property name="module.depends" value="client broker common junit-toolkit"/>
     <property name="module.manifest" value="MANIFEST.MF"/>
     <property name="module.plugin" value="true"/>
diff --git a/java/broker/build.xml b/java/broker/build.xml
index 295c38a3a3..e4a7d622f7 100644
--- a/java/broker/build.xml
+++ b/java/broker/build.xml
@@ -19,7 +19,7 @@
  -
  -->
 <project name="AMQ Broker" default="build">
-
+  <property name="module.name" value="broker"/>
   <property name="module.depends" value="common"/>
   <property name="module.main" value="org.apache.qpid.server.Main"/>
 
diff --git a/java/client/build.xml b/java/client/build.xml
index aeadfa2f0f..2e7e0e2efb 100644
--- a/java/client/build.xml
+++ b/java/client/build.xml
@@ -19,7 +19,7 @@
  -
  -->
 <project name="AMQ Client" default="build">
-
+  <property name="module.name" value="client"/>
   <property name="module.depends" value="common"/>
   <property name="module.test.depends" value="broker junit-toolkit"/>
 
diff --git a/java/cpp.async.testprofile b/java/cpp.async.testprofile
index 52f1db6d41..e7ab8f879e 100644
--- a/java/cpp.async.testprofile
+++ b/java/cpp.async.testprofile
@@ -15,3 +15,4 @@ test=*Test
 test1=*Tests
 haltonfailure=no
 haltonerror=no
+exclude.modules=systests
\ No newline at end of file
diff --git a/java/cpp.sync.testprofile b/java/cpp.sync.testprofile
index 75eff23622..f99a81954d 100644
--- a/java/cpp.sync.testprofile
+++ b/java/cpp.sync.testprofile
@@ -14,4 +14,5 @@ test.mem=512M
 test=*Test
 test1=*Tests
 haltonfailure=no
-haltonerror=no
\ No newline at end of file
+haltonerror=no
+exclude.modules=systests
\ No newline at end of file
diff --git a/java/cpp.testprofile b/java/cpp.testprofile
index 1613746888..8af64d59e3 100644
--- a/java/cpp.testprofile
+++ b/java/cpp.testprofile
@@ -15,3 +15,4 @@ test=*Test
 test1=*Tests
 haltonfailure=no
 haltonerror=no
+exclude.modules=systests
\ No newline at end of file
diff --git a/java/default.testprofile b/java/default.testprofile
index 9b848e20fd..4d3f961660 100644
--- a/java/default.testprofile
+++ b/java/default.testprofile
@@ -15,3 +15,4 @@ test=*Test
 test1=*Tests
 haltonfailure=no
 haltonerror=no
+exclude.modules=none
\ No newline at end of file
diff --git a/java/junit-toolkit/build.xml b/java/junit-toolkit/build.xml
index 3f24b81568..b5fc2604e5 100644
--- a/java/junit-toolkit/build.xml
+++ b/java/junit-toolkit/build.xml
@@ -19,7 +19,7 @@
  -
  -->
 <project name="Junit Toolkit" default="build">
-
+  <property name="module.name" value="junit-toolkit-maven-plugin"/>
   <property name="module.src" value="src/main"/>
 
   <import file="../module.xml"/>
diff --git a/java/module.xml b/java/module.xml
index de6007b6d2..2b5a798d58 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -185,10 +185,15 @@
     </and>
   </condition>
 
+
   <property file="${project.root}/${config}"/>
 
+  <condition property="dontruntest" value="dontruntest" else="runtest">
+         <contains substring="${module.name}" string="${exclude.modules}" />
+  </condition>
+
   <target name="test" depends="build,compile-tests" if="module.test.src.exists"
-          description="execute unit tests">
+         unless="${dontruntest}" description="execute unit tests">
 
     <junit fork="${test.fork}" maxmemory="${test.mem}" reloading="no"
            haltonfailure="${haltonfailure}" haltonerror="${haltonerror}"
diff --git a/java/perftests/build.xml b/java/perftests/build.xml
index ea5217939b..61b17acb0e 100644
--- a/java/perftests/build.xml
+++ b/java/perftests/build.xml
@@ -19,7 +19,7 @@
  -
  -->
 <project name="Performance Tests" default="build">
-
+    <property name="module.name" value="perftests"/>
     <property name="module.depends" value="systests client broker common junit-toolkit"/>
     <property name="module.dist" value="false"/>
 
diff --git a/java/systests/build.xml b/java/systests/build.xml
index 4eb7275e73..76b08f239f 100644
--- a/java/systests/build.xml
+++ b/java/systests/build.xml
@@ -20,6 +20,7 @@ nn - or more contributor license agreements.  See the NOTICE file
  -->
 <project name="System Tests" default="build">
 
+    <property name="module.name" value="systests"/>
     <property name="module.depends" value="client broker common junit-toolkit"/>
     <property name="module.test.src" location="src/main/java"/>
     <property name="module.test.excludes"