[prev in list] [next in list] [prev in thread] [next in thread]
List: jboss-cvs-commits
Subject: [jboss-cvs] jbosstest build.xml
From: Scott M Stark <starksm () users ! sourceforge ! net>
Date: 2004-10-31 20:05:03
Message-ID: E1COLwl-00023a-PV () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
User: starksm
Date: 04/10/31 12:05:03
Modified: . build.xml
Log:
Synch up with the fixes from the 4.0 branch
Revision Changes Path
1.424 +109 -38 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- build.xml 31 Oct 2004 19:57:51 -0000 1.423
+++ build.xml 31 Oct 2004 20:05:03 -0000 1.424
@@ -6,7 +6,7 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.423 2004/10/31 19:57:51 osdchicago Exp $ -->
+<!-- $Id: build.xml,v 1.424 2004/10/31 20:05:03 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
<import file="../tools/etc/buildmagic/build-common.xml"/>
@@ -574,6 +574,8 @@
<antcall target="tests-jbossmx-implementation"/>
<antcall target="tests-jbossmx-performance"/>
<antcall target="tests-iiop"/>
+ <antcall target="tests-webservices" />
+ <antcall target="tests-jaxr" />
<stop-jboss/>
<wait-on-shutdown conf="all" />
</target>
@@ -842,9 +844,10 @@
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="jbosstest.threadcount" \
value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" \
value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<classpath>
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
@@ -883,9 +886,10 @@
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="jbosstest.threadcount" \
value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" \
value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<classpath>
<pathelement location="${build.classes}"/>
@@ -991,6 +995,10 @@
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any \
jbosstest.* system properties --> + <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<classpath>
<pathelement location="${build.classes}"/>
@@ -1034,6 +1042,10 @@
<sysproperty key="jbosstest.secure" value="true"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any \
jbosstest.* system properties --> + <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="java.security.policy"
@@ -1080,12 +1092,10 @@
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="jbosstest.secure" value="true"/>
- <sysproperty key="jbosstest.iterationcount"
- value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.threadcount"
- value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.beancount"
- value="${jbosstest.beancount}"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<sysproperty key="java.security.policy"
value="${build.resources}/security/tst.policy"/>
<sysproperty key="java.security.auth.login.config"
@@ -1201,6 +1211,10 @@
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/>
<sysproperty key="jboss.aop.path" \
file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/> + <!-- \
Pass along any jbosstest.* system properties --> + <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<classpath>
<pathelement location="${build.classes}"/>
@@ -1254,6 +1268,10 @@
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/>
<sysproperty key="jboss.aop.path" \
file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/> + <!-- \
Pass along any jbosstest.* system properties --> + <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<classpath>
<pathelement location="${build.classes}"/>
@@ -1292,6 +1310,10 @@
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any \
jbosstest.* system properties --> + <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<classpath>
<pathelement location="${build.classes}"/>
@@ -1337,6 +1359,10 @@
value="${build.resources}/security/auth.conf"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any \
jbosstest.* system properties --> + <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<classpath>
<pathelement location="${build.classes}"/>
@@ -1510,9 +1536,10 @@
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="jbosstest.threadcount" \
value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" \
value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<classpath>
<pathelement location="${build.classes}"/>
@@ -1551,9 +1578,10 @@
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" \
value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<classpath>
<pathelement location="${build.classes}"/>
@@ -1578,10 +1606,54 @@
<!-- Run the Web Services Tests-->
<target name="tests-webservices"
description="Execute Web Services Related Tests">
- <!-- Test the Jaxr compliance-->
- <antcall target="tests-jaxr">
- <param name="jaxr.includes.refid" value="jaxr.includes"/>
- </antcall>
+
+ <echo message="java.endorsed.dirs=${jboss.dist}/lib/endorsed"/>
+
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}">
+
+ <jvmarg line="${junit.jvm.options}"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="jbosstest.secure" value="true"/>
+
+ <jvmarg value="-Djava.security.manager"/>
+ <sysproperty key="java.security.policy" \
value="${build.resources}/security/tst.policy"/> + <sysproperty \
key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> \
+ <sysproperty key="build.testlog" value="${build.testlog}"/> + \
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + \
<!-- Pass along any jbosstest.* system properties --> + <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
+
+ <!-- The crimson parser cannot do schema validation, which we need for \
jaxrpc-mapping.xml --> + <sysproperty key="java.endorsed.dirs" \
value="${jboss.dist}/lib/endorsed"/> +
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}/security"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}">
+
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/webservice/**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
</target>
<!-- Test for JAXR under the Web Services Umbrella -->
@@ -1592,7 +1664,7 @@
printsummary="${junit.printsummary}"
haltonerror="${junit.haltonerror}"
haltonfailure="${junit.haltonfailure}"
- fork="true"
+ fork="${junit.fork}"
timeout="${junit.timeout}"
jvm="${junit.jvm}"
failureProperty="tests.failure">
@@ -1643,7 +1715,7 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
- <patternset refid="${jaxr.includes.refid}"/>
+ <patternset refid="jaxr.includes"/>
</fileset>
</batchtest>
</junit>
@@ -1725,9 +1797,10 @@
<sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="jbosstest.threadcount" \
value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" \
value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<sysproperty key="java.security.auth.login.config"
value="${build.resources}/security/auth.conf"/>
@@ -1788,9 +1861,10 @@
<jvmarg value="-Djava.security.policy==${build.resources}/${test}/client.policy"/>
<sysproperty key="log4j.properties" \
file="${build.resources}/log4j.properties"/>
- <sysproperty key="jbosstest.threadcount" \
value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" \
value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<classpath>
<pathelement location="${build.classes}"/>
@@ -1831,9 +1905,10 @@
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="jbosstest.threadcount" \
value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" \
value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
<classpath>
<pathelement location="${build.classes}"/>
@@ -1878,10 +1953,6 @@
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" \
value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="jbosstest.threadcount" \
value="${jbosstest.threadcount}"/>
- <sysproperty key="jbosstest.iterationcount" \
value="${jbosstest.iterationcount}"/>
- <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
- <sysproperty key="jbosstest.nodeploy" value="${jbosstest.nodeploy}"/>
<sysproperty key="jbosstest.secure" value="true"/>
<!-- Pass along any jbosstest.* system properties -->
<syspropertyset>
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic