User: vlada
Date: 08/02/25 21:10:01
Modified: . build.xml
Log:
introduce parameter junit excludes
Revision Changes Path
1.130 +52 -18 JGroups/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/javagroups/JGroups/build.xml,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- build.xml 21 Feb 2008 01:12:54 -0000 1.129
+++ build.xml 26 Feb 2008 05:10:01 -0000 1.130
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<!-- $Id: build.xml,v 1.129 2008/02/21 01:12:54 vlada Exp $ -->
+<!-- $Id: build.xml,v 1.130 2008/02/26 05:10:01 vlada Exp $ -->
<project name="JGroups" default="compile" basedir=".">
<description>
@@ -53,8 +53,8 @@
<!-- patternsets used to define test sets -->
<patternset id="flush.tests">
<include name="org/jgroups/tests/FlushTest*"/>
- <include name="org/jgroups/tests/ConcurrentStartup**"/>
- <include name="org/jgroups/tests/ConcurrentState**"/>
+ <include name="org/jgroups/tests/ConcurrentStateTransferTest*"/>
+ <include name="org/jgroups/tests/ConcurrentStartupTest*"/>
</patternset>
<patternset id="mux.tests">
@@ -75,6 +75,12 @@
<exclude name="**/ChannelTestBase*"/>
</patternset>
+ <patternset id="junit.mux.excludes">
+ <exclude name="**/DistributedQueueTest*"/>
+ <exclude name="**/ChannelTestBase*"/>
+ <exclude name="**/SharedTransportTest*"/>
+ </patternset>
+
<target name="prepare">
<property environment="env"/>
@@ -382,10 +388,10 @@
<junit printsummary="yes" timeout="${unittest.timeout.low}" fork="yes" showoutput="${test.verbose}">
<jvmarg value="-Djgroups.bind_addr=${jgroups.bind_addr}"/>
<jvmarg value="-Djgroups.tcpping.initial_hosts=${jgroups.tcpping.initial_hosts}"/>
- <jvmarg value="-Djgroups.udp.mcast_addr=${jgroups.udp.mcast_addr}"/>
- <jvmarg value="-Djgroups.udp.mcast_port=${jgroups.udp.mcast_port}"/>
- <jvmarg value="-Djgroups.udp.ip_ttl=${jgroups.udp.ip_ttl}"/>
- <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <jvmarg value="-Djgroups.udp.mcast_addr=${jgroups.udp.mcast_addr}"/>
+ <jvmarg value="-Djgroups.udp.mcast_port=${jgroups.udp.mcast_port}"/>
+ <jvmarg value="-Djgroups.udp.ip_ttl=${jgroups.udp.ip_ttl}"/>
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<sysproperty key="cfg" value="${conf.dir}/stacks.xml"/>
<sysproperty key="log4j.configuration" value="file:${conf.dir}/log4j.properties"/>
<sysproperty key="tests.tmp.dir" value="${tmp.dir}"/>
@@ -402,7 +408,7 @@
<batchtest todir="${tmp.dir}/tests-results">
<fileset dir="${junit.dir}">
<patternset refid="@{set}"/>
- <patternset refid="junit.excludes"/>
+ <patternset refid="${junit.excludes}"/>
</fileset>
</batchtest>
</junit>
@@ -440,7 +446,7 @@
<batchtest todir="${tmp.dir}/tests-results">
<fileset dir="${junit-functional.dir}">
<patternset refid="@{set}"/>
- <patternset refid="junit.excludes"/>
+ <patternset refid="${junit.excludes}"/>
</fileset>
</batchtest>
</junit>
@@ -464,6 +470,7 @@
test.verbose=${test.verbose}
testname.ext=${testname.ext}
formatter.class=${formatter.class}
+ junit.excludes=${junit.excludes}
</testrunner>
</target>
@@ -480,13 +487,10 @@
test.verbose=${test.verbose}
testname.ext=${testname.ext}
formatter.class=${formatter.class}
+ junit.excludes=${junit.excludes}
</testrunner-functional>
</target>
-
-
-
-
<!--
Runs flush tests in various channel modes
@@ -505,7 +509,8 @@
<param name="channel.conf" value="udp.xml"/>
<param name="channel.conf.flush" value="flush-udp.xml"/>
<param name="test.verbose" value="false"/>
- <param name="testname.ext" value="udp"/>
+ <param name="testname.ext" value="udp"/>
+ <param name="junit.excludes" value="junit.excludes"/>
<param name="formatter.class" value="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"/>
</antcall>
@@ -516,6 +521,7 @@
<param name="channel.conf.flush" value="flush-tcp.xml"/>
<param name="test.verbose" value="false"/>
<param name="testname.ext" value="tcp"/>
+ <param name="junit.excludes" value="junit.excludes"/>
<param name="formatter.class" value="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"/>
</antcall>
@@ -525,6 +531,7 @@
<param name="mux.conf.stack" value="udp"/>
<param name="test.verbose" value="false"/>
<param name="testname.ext" value="mux-udp"/>
+ <param name="junit.excludes" value="junit.mux.excludes"/>
<param name="formatter.class" value="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"/>
</antcall>
@@ -534,10 +541,14 @@
<param name="mux.conf.stack" value="tcp"/>
<param name="test.verbose" value="false"/>
<param name="testname.ext" value="mux-tcp"/>
+ <param name="junit.excludes" value="junit.mux.excludes"/>
<param name="formatter.class" value="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"/>
</antcall>
</target>
+
+
+
<!--
Runs entire testsuite for nightly Cruise Control builds.
-->
@@ -556,6 +567,7 @@
<param name="testset" value="all.tests"/>
<param name="testname.ext" value="functional"/>
<param name="formatter.class" value="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"/>
+ <param name="junit.excludes" value="junit.excludes"/>
</antcall>
<antcall target="runtests">
@@ -563,6 +575,7 @@
<param name="channel.conf" value="udp.xml"/>
<param name="channel.conf.flush" value="flush-udp.xml"/>
<param name="testname.ext" value="udp"/>
+ <param name="junit.excludes" value="junit.excludes"/>
<param name="formatter.class" value="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"/>
</antcall>
@@ -572,6 +585,7 @@
<param name="channel.conf" value="tcp.xml"/>
<param name="channel.conf.flush" value="flush-tcp.xml"/>
<param name="testname.ext" value="tcp"/>
+ <param name="junit.excludes" value="junit.excludes"/>
<param name="formatter.class" value="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"/>
</antcall>
@@ -580,6 +594,7 @@
<param name="mux.on" value="true"/>
<param name="mux.conf.stack" value="udp"/>
<param name="testname.ext" value="mux-udp"/>
+ <param name="junit.excludes" value="junit.mux.excludes"/>
<param name="formatter.class" value="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"/>
</antcall>
@@ -588,6 +603,7 @@
<param name="mux.on" value="true"/>
<param name="mux.conf.stack" value="tcp"/>
<param name="testname.ext" value="mux-tcp"/>
+ <param name="junit.excludes" value="junit.mux.excludes"/>
<param name="formatter.class" value="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"/>
</antcall>
</target>
@@ -605,6 +621,7 @@
<param name="testset" value="all.tests"/>
<param name="channel.conf" value="udp.xml"/>
<param name="channel.conf.flush" value="flush-udp.xml"/>
+ <param name="junit.excludes" value="junit.excludes"/>
</antcall>
@@ -612,6 +629,7 @@
<param name="testset" value="all.tests"/>
<param name="channel.conf" value="tcp.xml"/>
<param name="channel.conf.flush" value="flush-tcp.xml"/>
+ <param name="junit.excludes" value="junit.excludes"/>
</antcall>
</target>
@@ -629,6 +647,7 @@
<param name="testset" value="all.tests"/>
<param name="channel.conf" value="udp.xml"/>
<param name="channel.conf.flush" value="flush-udp.xml"/>
+ <param name="junit.excludes" value="junit.excludes"/>
</antcall>
</target>
@@ -645,6 +664,7 @@
<param name="channel.conf" value="tunnel.xml"/>
<param name="channel.conf.flush" value="tunnel.xml"/>
<param name="mux.conf.stack" value="tunnel"/>
+ <param name="junit.excludes" value="junit.excludes"/>
</antcall>
</target>
@@ -664,6 +684,7 @@
<param name="testset" value="all.tests"/>
<param name="mux.on" value="true"/>
<param name="mux.conf.stack" value="udp"/>
+ <param name="junit.excludes" value="junit.mux.excludes"/>
</antcall>
</target>
@@ -679,9 +700,11 @@
<param name="testset" value="all.tests"/>
<param name="channel.conf" value="tcp.xml"/>
<param name="channel.conf.flush" value="flush-tcp.xml"/>
+ <param name="mux.conf.stack" value="tcp"/>
+ <param name="junit.excludes" value="junit.excludes"/>
</antcall>
</target>
-
+
<!--
Runs entire testsuite with default tcp-nio confguration specified by tcp-nio.xml.
Other valid parameters that can additionally be specified are:
@@ -694,9 +717,12 @@
<param name="testset" value="all.tests"/>
<param name="channel.conf" value="tcp-nio.xml"/>
<param name="channel.conf.flush" value="flush-tcp-nio.xml"/>
+ <param name="mux.conf.stack" value="tcp-nio"/>
+ <param name="junit.excludes" value="junit.excludes"/>
</antcall>
</target>
-
+
+
<!--
Runs entire testsuite in multiplexer mode with default stacks.xml
multiplexer tcp stack configuration.
@@ -712,6 +738,7 @@
<param name="testset" value="all.tests"/>
<param name="mux.on" value="true"/>
<param name="mux.conf.stack" value="tcp"/>
+ <param name="junit.excludes" value="junit.mux.excludes"/>
</antcall>
</target>
@@ -730,9 +757,11 @@
<param name="testset" value="all.tests"/>
<param name="mux.on" value="true"/>
<param name="mux.conf.stack" value="tcp-nio"/>
+ <param name="junit.excludes" value="junit.mux.excludes"/>
</antcall>
- </target>
-
+ </target>
+
+
<!--
Runs a single junit test indicated by -Dtest=<testname> parameter.
Note that indication of full class name is not necessary to invoke
@@ -757,6 +786,7 @@
<antcall target="runtests">
<param name="testset" value="one.test"/>
<param name="test.verbose" value="true"/>
+ <param name="junit.excludes" value="junit.excludes"/>
</antcall>
</target>
@@ -775,6 +805,7 @@
<param name="mux.conf.stack" value="udp"/>
<param name="testset" value="mux.tests"/>
<param name="test.verbose" value="true"/>
+ <param name="junit.excludes" value="junit.mux.excludes"/>
</antcall>
</target>
@@ -793,6 +824,7 @@
<param name="mux.conf.stack" value="udp-sync"/>
<param name="testset" value="mux.tests"/>
<param name="test.verbose" value="true"/>
+ <param name="junit.excludes" value="junit.mux.excludes"/>
</antcall>
</target>
@@ -811,6 +843,7 @@
<param name="mux.conf.stack" value="tcp"/>
<param name="testset" value="mux.tests"/>
<param name="test.verbose" value="true"/>
+ <param name="junit.excludes" value="junit.mux.excludes"/>
</antcall>
</target>
@@ -830,6 +863,7 @@
<param name="mux.conf.stack" value="tcp-sync"/>
<param name="testset" value="mux.tests"/>
<param name="test.verbose" value="true"/>
+ <param name="junit.excludes" value="junit.mux.excludes"/>
</antcall>
</target>
|