dwinterfeldt 01/07/10 18:57:46
Modified: . build-tests.xml
Log:
Added a batch test that will run all tests for the Logic Taglibs. Added a cleanup
for Tomcat 3 and 4 so the "test.all" can be run twice in a row.
Revision Changes Path
1.2 +16 -2 jakarta-struts/build-tests.xml
Index: build-tests.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build-tests.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-tests.xml 2001/05/06 12:07:31 1.1
+++ build-tests.xml 2001/07/11 01:57:44 1.2
@@ -148,7 +148,9 @@
<war warfile="${out.test.dir}/test.war"
webxml="${conf.test.dir}/web.xml">
-
+
+ <fileset dir="${web.dir}/test"/>
+
<classes dir="${out.test.dir}/classes"/>
<!-- We need to copy the Cactus, JUnit and Struts jars in the war.
@@ -186,7 +188,13 @@
<!-- Suite of tests -->
<test name="org.apache.struts.action.TestActionServlet"/>
-
+
+ <!-- Logic Taglib Tests -->
+ <batchtest fork="yes">
+ <fileset dir="${out.test.dir}/classes">
+ <include name="org/apache/struts/taglib/logic/Test*.class" />
+ </fileset>
+ </batchtest>
</junit>
</target>
@@ -202,6 +210,9 @@
<mkdir dir="${out.tomcat.32.dir}/webapps"/>
<mkdir dir="${out.tomcat.32.dir}/conf"/>
+ <!-- Delete old directory so new war is unzipped -->
+ <delete dir="${out.tomcat.32.dir}/webapps/test"/>
+
<!-- Copy war file -->
<copy file="${out.test.dir}/test.war" todir="${out.tomcat.32.dir}/webapps"/>
@@ -274,6 +285,9 @@
<mkdir dir="${out.tomcat.40.dir}/webapps"/>
<mkdir dir="${out.tomcat.40.dir}/conf"/>
+
+ <!-- Delete old directory so new war is unzipped -->
+ <delete dir="${out.tomcat.40.dir}/webapps/test"/>
<!-- Copy war file -->
<copy file="${out.test.dir}/test.war" todir="${out.tomcat.40.dir}/webapps"/>
