|
From: Francisco R. <rev...@us...> - 2002-04-26 17:50:56
|
User: reverbel
Date: 02/04/26 10:50:54
Modified: . Tag: Branch_3_0 build.xml
Log:
Changes merged from HEAD:
- IIOP tests excluded from tests-standard-stress.
- Created target tests-iiop-stress.
- Targets tests and tests-stress now depend on tests-iiop-stress.
- JacORB verbosity set to zero on iiop testcases.
- Target iiop-test now creates a test.log file.
Revision Changes Path
No revision
No revision
1.106.2.5 +62 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.4
retrieving revision 1.106.2.5
diff -u -r1.106.2.4 -r1.106.2.5
--- build.xml 26 Apr 2002 17:30:35 -0000 1.106.2.4
+++ build.xml 26 Apr 2002 17:50:54 -0000 1.106.2.5
@@ -2301,6 +2301,7 @@
tests-client-unit,
tests-security-basic-unit,
tests-standard-stress,
+ tests-iiop-stress,
tests-client-stress,
tests-security-basic-stress,
tests-jsr77-unit,
@@ -2326,7 +2327,8 @@
<target name="tests-stress" description="Execute all stress tests."
depends="init,
- tests-standard-stress,
+ tests-standard-stress,
+ tests-iiop-stress,
tests-client-stress,
tests-security-basic-stress,
tests-jbossmx-performance,
@@ -2438,12 +2440,13 @@
<fileset dir="${build.classes}">
<include name="**/*StressTestCase.class"/>
- <!-- do not include the perf or security tests -->
+ <!-- do not include the perf, security, or iiop tests -->
<!--mq test seems to break things-->
<!--exclude name="**/JBossMQPerfStressTestCase.class"/-->
<exclude name="**/test/perf/test/SecurePerfStressTestCase.class"/>
<exclude name="**/test/security/test/*"/>
<exclude name="**/test/securitymgr/test/*"/>
+ <exclude name="**/test/*iiop/test/*"/>
</fileset>
</batchtest>
</junit>
@@ -2968,6 +2971,58 @@
</target>
<!--
+ | IIOP test cases that should run successfully
+ -->
+
+ <target name="tests-iiop-stress" depends="maybejars">
+ <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}"/>
+ <jvmarg value="-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB"/>
+ <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton"/>
+ <jvmarg value="-Djacorb.orb.print_version=off"/>
+ <sysproperty key="jacorb.verbosity" value="0"/>
+ <jvmarg value="-Djava.security.manager"/>
+ <sysproperty key="java.security.policy"
+ value="${build.resources}/security/tst.policy"/>
+ <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}"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ <path refid="jboss.iiop.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="**/test/*iiop/test/*StressTestCase.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
-->
@@ -3037,9 +3092,13 @@
<jvmarg value="${junit.jvm.options}"/>
<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"/>
<jvmarg value="-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB"/>
<jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton"/>
+ <jvmarg value="-Djacorb.verbosity=0"/>
+ <jvmarg value="-Djacorb.orb.print_version=off"/>
<jvmarg value="-Djava.security.manager"/>
<jvmarg value="-Djava.security.policy==${build.resources}/${test}/client.policy"/>
<sysproperty key="log4j.properties" file="${build.resources}/log4j.properties"/>
|