User: d_jencks
Date: 01/09/11 21:55:37
Modified: . build.xml
Log:
Changed naming scheme of tests to *UnitTestCase.java for short running tests and
*StressTestCase.java for lengthy tests. Made tests-unit and tests-stress targets in
build.xml
Revision Changes Path
1.18 +154 -22 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 2001/09/11 23:45:06 1.17
+++ build.xml 2001/09/12 04:55:37 1.18
@@ -10,7 +10,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.17 2001/09/11 23:45:06 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.18 2001/09/12 04:55:37 d_jencks Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -18,7 +18,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <!-- Load Buildmagic extention tasks. -->
+ <!-- Load Buildmagic extension tasks. -->
<taskdef resource="planet57/tools/buildmagic/task/autoload.properties"/>
<taskdef name="property" classname="planet57.tools.buildmagic.task.Property"/>
@@ -1424,19 +1424,75 @@
-->
<target name="tests" description="Execute all tests."
- depends="init,
- tests-standard,
- tests-client,
- tests-security-basic,
- tests-report">
+ depends="init,
+ tests-standard-unit,
+ tests-client-unit,
+ tests-security-basic-unit,
+ tests-standard-stress,
+ tests-client-stress,
+ tests-security-basic-stress,
+ tests-report">
</target>
+
+ <target name="tests-unit" description="Execute all unit tests."
+ depends="init,
+ tests-standard-unit,
+ tests-client-unit,
+ tests-security-basic-unit,
+ tests-report"/>
+
+ <target name="tests-stress" description="Execute all stress tests."
+ depends="init,
+ tests-standard-stress,
+ tests-client-stress,
+ tests-security-basic-stress,
+ tests-report"/>
+
<!--
| Standard tests that should run successfully against a default JBoss
| server distribution build.
-->
+
+ <target name="tests-standard-unit" depends="jars">
+ <mkdir dir="${build.reports}"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}">
+
+ <jvmarg value="${junit.jvm.options}"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="javac.classpath"/>
+ </classpath>
+
+ <formatter type="${junit.formatter.type}"
+ usefile="${junit.formatter.usefile}"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}">
- <target name="tests-standard" depends="jars">
+ <fileset dir="${build.classes}">
+ <include name="**/*UnitTestCase.class"/>
+
+ <!-- do not include the perf or security tests -->
+ <exclude name="**/test/perf/test/SecurePerfStressTestCase"/>
+ <exclude name="**/test/security/test/*"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="tests-standard-stress" depends="jars">
<mkdir dir="${build.reports}"/>
<junit dir="${module.output}"
printsummary="${junit.printsummary}"
@@ -1464,13 +1520,10 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
- <include name="**/Test*.class"/>
- <include name="**/*Test.class"/>
- <include name="**/Main.class"/>
- <include name="**/AllJUnitTests.class"/>
+ <include name="**/*StressTestCase.class"/>
<!-- do not include the perf or security tests -->
- <exclude name="**/test/perf/test/TestSecurePerf*"/>
+ <exclude name="**/test/perf/test/SecurePerfStressTestCase"/>
<exclude name="**/test/security/test/*"/>
</fileset>
</batchtest>
@@ -1482,8 +1535,48 @@
| jar rather than the build.classes.dir. Typically these tests need to
| control how classes are loaded.
-->
+
+ <target name="tests-client-unit" depends="jars">
+ <mkdir dir="${build.reports}"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}">
+
+ <jvmarg value="${junit.jvm.options}"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+
+ <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"/>
+
+ <classpath>
+ <pathelement path="${build.lib}/jrmp-dl-client.jar"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="javac.classpath"/>
+ </classpath>
- <target name="tests-client" depends="jars">
+ <formatter type="${junit.formatter.type}"
+ 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="**/test/jrmp/test/DynLoadingUnitTestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="tests-client-stress" depends="jars">
<mkdir dir="${build.reports}"/>
<junit dir="${module.output}"
printsummary="${junit.printsummary}"
@@ -1517,7 +1610,7 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
- <include name="**/test/jrmp/test/TestDynLoading"/>
+ <!--there aren't any of these - included for symmetry-->
</fileset>
</batchtest>
</junit>
@@ -1527,8 +1620,50 @@
| Standard security tests that should run successfully against a default
| JBoss server distribution build.
-->
+
+ <target name="tests-security-basic-unit" depends="jars">
+ <mkdir dir="${build.reports}"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}">
+
+ <jvmarg value="${junit.jvm.options}"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+
+ <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"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}/security"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="javac.classpath"/>
+ </classpath>
+
+ <formatter type="${junit.formatter.type}"
+ 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="**/test/security/test/*UnitTestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
- <target name="tests-security-basic" depends="jars">
+ <target name="tests-security-basic-stress" depends="jars">
<mkdir dir="${build.reports}"/>
<junit dir="${module.output}"
printsummary="${junit.printsummary}"
@@ -1563,8 +1698,8 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
- <include name="**/test/perf/test/TestSecurePerf*"/>
- <include name="**/test/security/test/*"/>
+ <include name="**/test/perf/test/SecurePerfStressTestCase.class"/>
+ <include name="**/test/security/test/*StressTestCase.class"/>
</fileset>
</batchtest>
</junit>
@@ -1604,10 +1739,7 @@
fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/${test}/test/Test*.class"/>
- <include name="org/jboss/test/${test}/test/*Test.class"/>
- <include name="org/jboss/test/${test}/test/Main.class"/>
- <include name="org/jboss/test/${test}/test/AllJUnitTests.class"/>
+ <include name="org/jboss/test/${test}/test/*TestCase.class"/>
</fileset>
</batchtest>
</junit>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
