From: Scott S. <sco...@jb...> - 2005-07-31 04:42:55
|
User: starksm Date: 05/07/31 00:41:45 Modified: jbosstest Tag: Branch_4_0 build.xml Log: Use the run-junit macro in the tests-jacc-securitymgr Revision Changes Path No revision No revision 1.406.2.93 +7 -52 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.92 retrieving revision 1.406.2.93 diff -u -b -r1.406.2.92 -r1.406.2.93 --- build.xml 28 Jul 2005 13:55:45 -0000 1.406.2.92 +++ build.xml 31 Jul 2005 04:41:44 -0000 1.406.2.93 @@ -12,7 +12,7 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.92 2005/07/28 13:55:45 sebersole Exp $ --> +<!-- $Id: build.xml,v 1.406.2.93 2005/07/31 04:41:44 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1443,58 +1443,13 @@ </waitfor> <fail message="Timeout waiting for server to start" if="startup.timeout"/> + <propertyset id="jacc-tests-props"> + <propertyref prefix="java.security.auth"/> + </propertyset> - <junit dir="${module.output}" - printsummary="true" - haltonerror="false" - haltonfailure="false" - fork="true" - timeout="${junit.timeout}" - jvm="${junit.jvm}"> - - <jvmarg value="${junit.jvm.options}"/> - - <!-- - <jvmarg value="-Djava.security.manager"/> - <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/client.policy"/> - <jvmarg value="-Djava.security.debug=access,failure"/> - --> - <sysproperty key="jbosstest.server.host" value="${node0}"/> - <sysproperty key="jboss.home" file="${project.root}"/> - <sysproperty key="jboss.thirdparty.dir" file="${project.root}/thirdparty"/> - <sysproperty key="jboss.tools.dir" file="${project.root}/tools"/> - <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> - <sysproperty key="jbosstest.secure" value="true"/> - <sysproperty key="jboss-junit-configuration" value="JACC+SecurityMgr"/> - <!-- Pass along any jbosstest.* system properties --> - <syspropertyset> - <propertyref prefix="jbosstest."/> - </syspropertyset> - <sysproperty key="java.security.auth.login.config" - value="${build.resources}/security/auth.conf"/> - <sysproperty key="build.testlog" value="${build.testlog}"/> - <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - - <classpath> - <pathelement location="${build.resources}"/> - <pathelement location="${build.classes}"/> - <path refid="tests.classpath"/> - </classpath> - - <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" - usefile="${junit.formatter.usefile}" - extension="-${jboss-junit-configuration}.xml"/> - - <batchtest todir="${build.reports}" - haltonerror="false" - haltonfailure="false" - fork="true"> - - <fileset dir="${build.classes}"> - <patternset refid="jacc.includes"/> - </fileset> - </batchtest> - </junit> + <run-junit junit.patternset="jacc.includes" + junit.configuration="JACC+SecurityMgr" + junit.syspropertyset="jacc-tests-props" /> <stop-jboss/> <wait-on-shutdown conf="jacc"/> |