Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Scott M S. <st...@us...> - 2003-04-10 09:05:55
|
User: starksm
Date: 03/04/10 02:05:54
Modified: . Tag: Branch_3_2 build.xml
Log:
- Further cleanup the jmxtest.jar content
- Drop the reliance on the custom junit report formatter as the ant 1.5.2
version does detect testcase timeouts
Revision Changes Path
No revision
No revision
1.165.2.57 +27 -47 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.165.2.56
retrieving revision 1.165.2.57
diff -u -r1.165.2.56 -r1.165.2.57
--- build.xml 9 Apr 2003 19:18:53 -0000 1.165.2.56
+++ build.xml 10 Apr 2003 09:05:49 -0000 1.165.2.57
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.165.2.56 2003/04/09 19:18:53 d_jencks Exp $ -->
+<!-- $Id: build.xml,v 1.165.2.57 2003/04/10 09:05:49 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1815,8 +1815,9 @@
<exclude name="org/jboss/test/jmx/mbean*/**"/>
</fileset>
<fileset dir="${build.resources}/jmx">
- <include name="*.*"/>
- <include name="META-INF/*.*"/>
+ <include name="test-service.xml"/>
+ <include name="META-INF/ejb-jar.xml"/>
+ <include name="META-INF/jboss.xml"/>
</fileset>
</jar>
@@ -2397,10 +2398,6 @@
<include name="org/jboss/test/jrmp/test/DynLoading*.class"/>
<include name="org/jboss/test/JBossTestCase.class"/>
<include name="org/jboss/test/JBossTestServices.class"/>
- <!-- This test cannot run with ${build.classes} in the classpath -->
- <!-- so include the custom ant task in jar -->
- <!-- A better fix might be to build the ant stuff in a different subfolder -->
- <include name="org/jboss/ant/taskdefs/XMLJUnitResultFormatter.class"/>
</fileset>
</jar>
@@ -3042,7 +3039,6 @@
<fileset dir="${build.classes}">
<include name="org/jboss/test/*.class"/>
<include name="org/jboss/test/securitymgr/test/**"/>
- <include name="org/jboss/ant/taskdefs/XMLJUnitResultFormatter.class"/>
</fileset>
</jar>
</target>
@@ -3840,8 +3836,11 @@
<path refid="tests.classpath"/>
</classpath>
+<!--
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ usefile="${junit.formatter.usefile}"/>
+-->
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -3900,8 +3899,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -3951,8 +3949,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4002,8 +3999,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4049,8 +4045,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4100,8 +4095,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4150,8 +4144,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4295,8 +4288,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4349,8 +4341,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4399,8 +4390,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4449,8 +4439,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4489,8 +4478,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4531,8 +4519,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4573,8 +4560,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4629,8 +4615,7 @@
<path refid="jboss.iiop.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4673,8 +4658,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4735,8 +4719,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4795,8 +4778,7 @@
<path refid="jboss.iiop.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4838,8 +4820,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}"
haltonerror="${junit.batchtest.haltonerror}"
@@ -4892,8 +4873,7 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
- extension=".xml" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
<test todir="${build.reports}" name="${test}"
haltonerror="${junit.batchtest.haltonerror}"
|
