User: ejort
Date: 02/02/01 19:16:21
Modified: . build.xml
Log:
JBossMX tests, temporary modifications to classpaths see comment in build.xml
Revision Changes Path
1.60 +282 -16 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- build.xml 2002/01/30 23:00:32 1.59
+++ build.xml 2002/02/02 03:16:21 1.60
@@ -12,8 +12,23 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.59 2002/01/30 23:00:32 d_jencks Exp $ -->
+<!-- [EMAIL PROTECTED] -->
+<!-- TEMPORARY: Until JBossMX is stable the tests are run over JMXRI -->
+<!-- But for the JBossMX tests to compile we have to build -->
+<!-- over jboss-jmx.jar and those tests need to run over -->
+<!-- that jar. -->
+<!-- CHANGES: The classpaths have changed as follows. -->
+<!-- most.classpath contains all jars except the jmx implementation -->
+<!-- javac.classpath adds jboss-jmx.jar for compilation -->
+<!-- tests.classpath adds jmxri.jar for running the main tests -->
+<!-- tests.jbossmx.classpath adds jboss-jmx.jar for running JBossMX tests-->
+<!-- NOTE: If somebody can think of a cleaner way of doing this -->
+<!-- please feel free to fix it. But the test -->
+<!-- tests-jmxri-compliance still needs to run over jmxri.jar -->
+<!-- the aim of that test is to check our compliance suite. -->
+<!-- $Id: build.xml,v 1.60 2002/02/02 03:16:21 ejort Exp $ -->
+
<project default="main" name="JBoss/Testsuite">
<!-- ================================================================== -->
@@ -155,7 +170,8 @@
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="sun.jndi.classpath"/>
- <path refid="sun.jmx.classpath"/>
+<!-- See comment at start -->
+<!-- <path refid="sun.jmx.classpath"/> -->
<path refid="sun.jaxp.classpath"/>
<path refid="sun.jaas.classpath"/>
<path refid="sun.javamail.classpath"/>
@@ -216,6 +232,12 @@
<pathelement path="${jboss.cluster.lib}/jbossha-client.jar"/>
</path>
+ <!-- JBossMX -->
+ <property name="jboss.jmx.root" value="${project.root}/jmx/output"/>
+ <property name="jboss.jmx.lib" value="${jboss.jmx.root}/lib"/>
+ <path id="jboss.jmx.classpath">
+ <pathelement path="${jboss.jmx.lib}/jboss-jmx.jar"/>
+ </path>
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
@@ -276,8 +298,8 @@
<property name="classpath" value=""/>
<property name="local.classpath" value=""/>
- <!-- The classpath required to build classes. -->
- <path id="javac.classpath">
+ <!-- Class minus JMX implementation see comment at start -->
+ <path id="most.classpath">
<pathelement path="${classpath}"/>
<pathelement path="${local.classpath}"/>
<pathelement path="${project.tools}/lib/ant.jar"/>
@@ -286,6 +308,27 @@
<path refid="thirdparty.classpath"/>
</path>
+ <!-- The classpath required to build classes. -->
+ <!-- Used for building see comment at start -->
+ <path id="javac.classpath">
+ <path refid="most.classpath"/>
+ <path refid="jboss.jmx.classpath"/>
+ </path>
+
+ <!-- The classpath required to run tests classes. -->
+ <!-- Run over JMXRI see comment at start -->
+ <path id="tests.classpath">
+ <path refid="most.classpath"/>
+ <path refid="sun.jmx.classpath"/>
+ </path>
+
+ <!-- The classpath required to run tests for JBossMX classes. -->
+ <!-- Run over JBossMX see comment at start -->
+ <path id="tests.jbossmx.classpath">
+ <path refid="most.classpath"/>
+ <path refid="jboss.jmx.classpath"/>
+ </path>
+
<!-- The classpath required to build javadocs. -->
<path id="javadoc.classpath">
<path refid="javac.classpath"/>
@@ -483,6 +526,7 @@
_jars-security,
_jars-cmp2,
_jars-jsr77,
+ _jars-jbossmx,
_jars-ejbconf">
</target>
@@ -1506,6 +1550,35 @@
</jar>
</target>
+ <!-- JbossMX tests -->
+ <target name="_jars-jbossmx">
+ <mkdir dir="${build.lib}"/>
+
+ <!-- build compliance.jar -->
+ <jar jarfile="${build.lib}/jbossmx-compliance.jar">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.application.classes"/>
+ <include name="org/jboss/test/jbossmx/compliance/**"/>
+ </fileset>
+ </jar>
+
+ <!-- build implementation.jar -->
+ <jar jarfile="${build.lib}/jbossmx-implementation.jar">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.application.classes"/>
+ <include name="org/jboss/test/jbossmx/implementation/**"/>
+ </fileset>
+ </jar>
+
+ <!-- build performance.jar -->
+ <jar jarfile="${build.lib}/jbossmx-performance.jar">
+ <fileset dir="${build.classes}">
+ <patternset refid="common.test.application.classes"/>
+ <include name="org/jboss/test/jbossmx/performance/**"/>
+ </fileset>
+ </jar>
+ </target>
+
<!-- jca ejbconf readonly tests -->
<target name="_jars-ejbconf">
<mkdir dir="${build.lib}"/>
@@ -1522,7 +1595,6 @@
</target>
-
<!-- ================================================================== -->
<!-- Documents -->
<!-- ================================================================== -->
@@ -1664,6 +1736,9 @@
tests-security-basic-stress,
tests-jsr77-unit,
tests-util-unit,
+ tests-jbossmx-compliance,
+ tests-jbossmx-implementation,
+ tests-jbossmx-performance,
tests-report">
</target>
@@ -1675,14 +1750,40 @@
tests-security-basic-unit,
tests-jsr77-unit,
tests-util-unit,
- tests-report"/>
+ tests-jbossmx-compliance,
+ tests-jbossmx-implementation,
+ tests-report">
+ </target>
<target name="tests-stress" description="Execute all stress tests."
depends="init,
tests-standard-stress,
tests-client-stress,
tests-security-basic-stress,
- tests-report"/>
+ tests-jbossmx-performance,
+ tests-report">
+ </target>
+
+ <!--
+ | Helper for running all jbossmx tests
+ -->
+ <target name="tests-jbossmx-all" description="Execute all jmx tests."
+ depends="init,
+ tests-jbossmx-compliance,
+ tests-jbossmx-implementation,
+ tests-jbossmx-performance,
+ tests-report">
+ </target>
+
+ <!--
+ | Helper to run the jmx compliance tests over JBossMX and jmxri
+ | There is no point generating reports, the second test overwrites the
+ | first report.
+ -->
+ <target name="tests-jmx-compliance" description="Execute all jmx compliance
tests."
+ depends="init,
+ tests-jmxri-compliance,
+ tests-jbossmx-compliance"/>
<!--
| Standard tests that should run successfully against a default JBoss
@@ -1707,7 +1808,7 @@
<classpath>
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
- <path refid="javac.classpath"/>
+ <path refid="tests.classpath"/>
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
@@ -1761,7 +1862,7 @@
<classpath>
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
- <path refid="javac.classpath"/>
+ <path refid="tests.classpath"/>
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
@@ -1815,7 +1916,7 @@
<classpath>
<pathelement path="${build.lib}/jrmp-dl-client.jar"/>
<pathelement location="${build.resources}"/>
- <path refid="javac.classpath"/>
+ <path refid="tests.classpath"/>
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
@@ -1861,7 +1962,7 @@
<classpath>
<pathelement path="${build.lib}/jrmp-dl-client.jar"/>
<pathelement location="${build.resources}"/>
- <path refid="javac.classpath"/>
+ <path refid="tests.classpath"/>
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
@@ -1911,7 +2012,7 @@
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}/security"/>
<pathelement location="${build.resources}"/>
- <path refid="javac.classpath"/>
+ <path refid="tests.classpath"/>
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
@@ -1959,7 +2060,7 @@
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}/security"/>
<pathelement location="${build.resources}"/>
- <path refid="javac.classpath"/>
+ <path refid="tests.classpath"/>
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
@@ -2010,7 +2111,7 @@
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}/security"/>
<pathelement location="${build.resources}"/>
- <path refid="javac.classpath"/>
+ <path refid="tests.classpath"/>
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
@@ -2059,7 +2160,7 @@
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}/security"/>
<pathelement location="${build.resources}"/>
- <path refid="javac.classpath"/>
+ <path refid="tests.classpath"/>
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
@@ -2077,6 +2178,171 @@
</junit>
</target>
+ <!--
+ | JBossMX implementation tests that should run correctly.
+ -->
+
+ <target name="tests-jbossmx-implementation" depends="jars">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <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="log4j.properties"
file="${build.resources}/log4j.properties"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <path refid="tests.jbossmx.classpath"/>
+ </classpath>
+
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
+ extension=".xml" 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="**/jbossmx/implementation/**/*TestCase.class"/>
+ <!-- Ignore the abstract class -->
+ <exclude name="org/jboss/test/jbossmx/implementation/TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--
+ | JBossMX performance tests that should run correctly.
+ -->
+
+ <target name="tests-jbossmx-performance" depends="jars">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <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="log4j.properties"
file="${build.resources}/log4j.properties"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <path refid="tests.jbossmx.classpath"/>
+ </classpath>
+
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
+ extension=".xml" 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="**/jbossmx/performance/**/*TestCase.class"/>
+ <!-- Ignore the abstract class -->
+ <exclude name="org/jboss/test/jbossmx/performance/TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--
+ | JBossMX compliance tests that should run correctly.
+ -->
+
+ <target name="tests-jbossmx-compliance" depends="jars">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <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="log4j.properties"
file="${build.resources}/log4j.properties"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <path refid="tests.jbossmx.classpath"/>
+ </classpath>
+
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
+ extension=".xml" 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="**/jbossmx/compliance/**/*TestCase.class"/>
+ <!-- Ignore the abstract class -->
+ <exclude name="org/jboss/test/jbossmx/compliance/TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--
+ | JMXRI compliance tests that *might* run correctly.
+ -->
+
+ <target name="tests-jmxri-compliance" depends="jars">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <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="log4j.properties"
file="${build.resources}/log4j.properties"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <path refid="sun.jmx.classpath"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
+ extension=".xml" 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="**/jbossmx/compliance/**/*TestCase.class"/>
+ <!-- Ignore the abstract class -->
+ <exclude name="org/jboss/test/jbossmx/compliance/TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<!--
| Run testcases in a single directory by specifing the test directory
| name in -Dtest=dirname in tests/dirname/test/**TestCase.class
@@ -2105,7 +2371,7 @@
<classpath>
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
- <path refid="javac.classpath"/>
+ <path refid="tests.classpath"/>
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
@@ -2152,7 +2418,7 @@
<classpath>
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
- <path refid="javac.classpath"/>
+ <path refid="tests.classpath"/>
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitResultFormatter"
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
