Author: arnaudsimon
Date: Thu May 8 05:24:43 2008
New Revision: 654505
URL: http://svn.apache.org/viewvc?rev=654505&view=rev
Log:
QPID-1037: Added module name prop and an exclude.modules prop + switch systests
off in cpp profiles.
Modified:
incubator/qpid/trunk/qpid/java/broker-plugins/build.xml
incubator/qpid/trunk/qpid/java/broker/build.xml
incubator/qpid/trunk/qpid/java/client/build.xml
incubator/qpid/trunk/qpid/java/cpp.async.testprofile
incubator/qpid/trunk/qpid/java/cpp.sync.testprofile
incubator/qpid/trunk/qpid/java/cpp.testprofile
incubator/qpid/trunk/qpid/java/default.testprofile
incubator/qpid/trunk/qpid/java/junit-toolkit/build.xml
incubator/qpid/trunk/qpid/java/module.xml
incubator/qpid/trunk/qpid/java/perftests/build.xml
incubator/qpid/trunk/qpid/java/systests/build.xml
Modified: incubator/qpid/trunk/qpid/java/broker-plugins/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker-plugins/build.xml?rev=654505&r1=654504&r2=654505&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker-plugins/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker-plugins/build.xml Thu May 8 05:24:43
2008
@@ -19,7 +19,7 @@
-
-->
<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"/>
Modified: incubator/qpid/trunk/qpid/java/broker/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/build.xml?rev=654505&r1=654504&r2=654505&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/build.xml Thu May 8 05:24:43 2008
@@ -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"/>
Modified: incubator/qpid/trunk/qpid/java/client/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/build.xml?rev=654505&r1=654504&r2=654505&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/client/build.xml Thu May 8 05:24:43 2008
@@ -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"/>
Modified: incubator/qpid/trunk/qpid/java/cpp.async.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.async.testprofile?rev=654505&r1=654504&r2=654505&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.async.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/cpp.async.testprofile Thu May 8 05:24:43
2008
@@ -15,3 +15,4 @@
test1=*Tests
haltonfailure=no
haltonerror=no
+exclude.modules=systests
\ No newline at end of file
Modified: incubator/qpid/trunk/qpid/java/cpp.sync.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.sync.testprofile?rev=654505&r1=654504&r2=654505&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.sync.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/cpp.sync.testprofile Thu May 8 05:24:43 2008
@@ -14,4 +14,5 @@
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
Modified: incubator/qpid/trunk/qpid/java/cpp.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.testprofile?rev=654505&r1=654504&r2=654505&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/cpp.testprofile Thu May 8 05:24:43 2008
@@ -15,3 +15,4 @@
test1=*Tests
haltonfailure=no
haltonerror=no
+exclude.modules=systests
\ No newline at end of file
Modified: incubator/qpid/trunk/qpid/java/default.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/default.testprofile?rev=654505&r1=654504&r2=654505&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/default.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/default.testprofile Thu May 8 05:24:43 2008
@@ -15,3 +15,4 @@
test1=*Tests
haltonfailure=no
haltonerror=no
+exclude.modules=none
\ No newline at end of file
Modified: incubator/qpid/trunk/qpid/java/junit-toolkit/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/junit-toolkit/build.xml?rev=654505&r1=654504&r2=654505&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/junit-toolkit/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/junit-toolkit/build.xml Thu May 8 05:24:43
2008
@@ -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"/>
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=654505&r1=654504&r2=654505&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Thu May 8 05:24:43 2008
@@ -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}"
Modified: incubator/qpid/trunk/qpid/java/perftests/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/build.xml?rev=654505&r1=654504&r2=654505&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/perftests/build.xml Thu May 8 05:24:43 2008
@@ -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"/>
Modified: incubator/qpid/trunk/qpid/java/systests/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/build.xml?rev=654505&r1=654504&r2=654505&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/systests/build.xml Thu May 8 05:24:43 2008
@@ -20,6 +20,7 @@
-->
<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"
