User: starksm Date: 01/12/09 02:50:21 Modified: src/build Tag: Branch_2_4 run_tests.xml Log: Make unit test timeout a common property Revision Changes Path No revision No revision 1.15.2.9 +16 -15 jbosstest/src/build/Attic/run_tests.xml Index: run_tests.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/src/build/Attic/run_tests.xml,v retrieving revision 1.15.2.8 retrieving revision 1.15.2.9 diff -u -r1.15.2.8 -r1.15.2.9 --- run_tests.xml 2001/11/09 10:52:36 1.15.2.8 +++ run_tests.xml 2001/12/09 10:50:21 1.15.2.9 @@ -2,7 +2,7 @@ <!-- An ant build file for running the test code against a JBoss server dist -$Revision: 1.15.2.8 $ +$Revision: 1.15.2.9 $ --> <project name="JBossUnitTests" default="run-tests" basedir="../../"> @@ -45,8 +45,8 @@ <property name="build.javadocs.dir" value="${build.dir}/docs/api"/> <property name="dist.dir" value="dist"/> - <property name="test.results.dir" value="${basedir}/.."/> - + <property name="test.results.dir" value="${basedir}/../results"/> + <property name="test.timeout" value="240000"/> <property name="email.from" value="[EMAIL PROTECTED]"/> <property name="email.to.list" value="[EMAIL PROTECTED]"/> <property name="email.mailhost" value="localhost" /> @@ -86,7 +86,8 @@ <!-- Execute the junit tests --> <!-- =================================================================== --> <target name="run-tests" depends="build" if="junit.present"> - + <delete dir="${test.results.dir}" /> + <mkdir dir="${test.results.dir}" /> <antcall target="standard-tests" /> <antcall target="basic-security-tests" /> <antcall target="client-tests" /> @@ -108,7 +109,7 @@ <!-- =================================================================== --> <target name="standard-tests"> <junit printsummary="yes" haltonfailure="no" fork="true" - dir="${build.classes.dir}" timeout="360000" + dir="${build.classes.dir}" timeout="${test.timeout}" > <jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" /> <classpath> @@ -137,7 +138,7 @@ <!-- =================================================================== --> <target name="basic-security-tests"> <junit printsummary="no" haltonfailure="yes" fork="true" - dir="${build.classes.dir}" timeout="360000" + dir="${build.classes.dir}" timeout="${test.timeout}" > <jvmarg value="-Djava.security.manager" /> <jvmarg value="-Djava.security.policy=${src.resources}/security/tst.policy" /> @@ -170,7 +171,7 @@ <target name="client-tests"> <junit printsummary="no" haltonfailure="no" fork="true" - dir="${build.classes.dir}" timeout="360000" + dir="${build.classes.dir}" timeout="${test.timeout}" > <jvmarg value="-Djava.security.manager" /> <jvmarg value="-Djava.security.policy=${src.resources}/security/tst.policy" /> @@ -232,7 +233,7 @@ </jar> <junit printsummary="no" haltonfailure="no" fork="true" - dir="${build.classes.dir}" timeout="360000" + dir="${build.classes.dir}" timeout="${test.timeout}" > <jvmarg value="-Djava.security.manager" /> <jvmarg value="-Djava.security.policy=${src.resources}/security/tst.policy" /> @@ -258,7 +259,7 @@ <!-- Run with a global security domain --> <junit printsummary="no" haltonfailure="yes" fork="true" - dir="${build.classes.dir}" timeout="360000" + dir="${build.classes.dir}" timeout="${test.timeout}" > <jvmarg value="-Djava.security.manager" /> <jvmarg value="-Djava.security.policy=${src.resources}/security/tst.policy" /> @@ -283,6 +284,8 @@ --> <!-- =================================================================== --> <target name="run-testcase" if="testcase"> + <property name="cp" refid="test.classpath" /> + <echo message="cp=${cp}" /> <junit printsummary="yes" haltonfailure="no" fork="true"> <jvmarg value="-Djava.security.manager" /> <jvmarg value="-Djava.security.policy=${src.resources}/security/tst.policy" /> @@ -293,7 +296,7 @@ <pathelement path="${build.classes.dir}" /> <pathelement path="${jboss.lib}/jboss-jaas.jar" /> </classpath> - <formatter type="xml" usefile="true" /> + <formatter type="plain" usefile="true" /> <batchtest todir="${test.results.dir}"> <fileset dir="${src.dir}"> <include name="org/jboss/test/${testcase}/test/Test*.java" /> @@ -308,14 +311,12 @@ <!-- =================================================================== --> <target name="test1"> <junit printsummary="yes" haltonfailure="no" fork="true" - dir="${build.classes.dir}" timeout="1200000" + dir="${build.classes.dir}" timeout="${test.timeout}" > <jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" /> <jvmarg value="-Djava.security.manager" /> <jvmarg value="-Djava.security.policy=${src.resources}/security/tst.policy" /> <jvmarg value="-Djava.security.auth.login.config=${src.resources}/security/auth.conf" /> - <jvmarg value="-Dsun.rmi.loader.logLevel=VERBOSE" /> - <jvmarg value="-Dsun.rmi.server.logLevel=VERBOSE" /> <classpath> <path refid="test.classpath" /> @@ -324,7 +325,7 @@ </classpath> <formatter type="plain" usefile="false" /> - <test name="org.jboss.test.jrmp.test.TestDynLoading" /> + <test name="org.jboss.test.perf.test.TestPerf" /> </junit> </target> @@ -338,7 +339,7 @@ <property name="j2ee.home" value="/usr/local/Java/j2sdkee1.2.1" /> <junit printsummary="yes" haltonfailure="no" fork="true" - dir="${build.classes.dir}" timeout="120000" + dir="${build.classes.dir}" timeout="${test.timeout}" > <jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" /> <jvmarg value="-Djava.security.manager" />
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development