[jboss-cvs] jboss-portal/cms ...
Julien Viet
julien at jboss.com
Mon Jul 17 09:11:25 EDT 2006
User: julien
Date: 06/07/17 09:11:25
Modified: cms build.xml
Log:
fix cms tests
Revision Changes Path
1.34 +48 -68 jboss-portal/cms/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/cms/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- build.xml 28 Jun 2006 20:08:31 -0000 1.33
+++ build.xml 17 Jul 2006 13:11:25 -0000 1.34
@@ -8,7 +8,7 @@
<!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
]>
-<!-- $Id: build.xml,v 1.33 2006/06/28 20:08:31 rgenova Exp $ -->
+<!-- $Id: build.xml,v 1.34 2006/07/17 13:11:25 julien Exp $ -->
<!--+======================================================================+-->
<!--| JBoss Portal (The OpenSource Portal) Build File |-->
@@ -58,6 +58,10 @@
<target name="configure" unless="configure.disable">
+ <!-- Configure some properties -->
+ <property name="jboss-junit-configuration" value=""/>
+ <property name="junit.formatter.usefile" value="true"/>
+
<!-- Configure thirdparty libraries -->
&libraries;
<path id="library.classpath">
@@ -80,9 +84,6 @@
<path refid="sun.jaf.classpath"/>
<path refid="xdoclet.xdoclet.classpath"/>
<path refid="jcr.jcr.classpath"/>
- <!-- For testing -->
- <path refid="dom4j.dom4j.classpath"/>
- <!-- Used for org.jboss.portal.test.support should be removed once this will be moved out -->
</path>
@@ -96,8 +97,8 @@
<!-- Configure modules -->
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
- <path refid="jboss.portal-common.classpath"/>
<path refid="jboss.portal-server.classpath"/>
+ <path refid="jboss.portal-common.classpath"/>
<path refid="jboss.portal-test.classpath"/>
</path>
@@ -200,71 +201,50 @@
<!-- Test. -->
<!-- ================================================================== -->
- <target name="test" depends="output">
-
- <property name="build.testlog" value="${build.classes}/log"/>
- <property name="build.reports" value="${build.classes}/report"/>
-
- <echo><![CDATA[
- ${build.reports}
- ${build.testlog}
- ${module.output}
- ${junit.printsummary}
- ${junit.batchtest.haltonerror}
- ${junit.batchtest.haltonfailure}
- ${junit.batchtest.fork}
- ${junit.timeout}
- ${junit.jvm}
- ]]></echo>
-
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
- <echo>####################################</echo>
- <echo message="${jboss.portal-test.root}"/>
-
- <junit
- dir="${module.output}"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}"
- jvm="${junit.jvm}">
-
- <formatter type="plain" usefile="false"/>
- <formatter type="xml" usefile="true"/>
- <!--
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="build.resources" value="${build.resources}"/>
-
- <sysproperty key="java.security.auth.login.config" value="${build.resources}/test/jcr/jaas.config"/>
- -->
-
-
+ <target name="test" depends="init">
+ <execute-tests>
+ <x-test>
<test todir="${build.testlog}" name="org.jboss.portal.test.cms.JackrabbitTestCase"/>
<test todir="${build.testlog}" name="org.jboss.portal.test.cms.TestRepositoryBootStrap"/>
<test todir="${build.testlog}" name="org.jboss.portal.test.cms.TestRepositoryUtil"/>
<test todir="${build.testlog}" name="org.jboss.portal.test.cms.commands.TestFileCommands"/>
<test todir="${build.testlog}" name="org.jboss.portal.test.cms.commands.TestFolderCommands"/>
<!--test todir="${build.testlog}" name="org.jboss.portal.test.cms.TestAll"/-->
-
- <classpath>
+ </x-test>
+ <x-classpath>
+ <path refid="apache.logging.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="jboss.cache.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="hibernate.hibernate.classpath"/>
+ <path refid="ehcache.ehcache.classpath"/>
+ <path refid="jbossas/core.libs.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="jakarta.io.classpath"/>
+ <path refid="apache.collections.classpath"/>
+ <path refid="apache.lucene.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="jackrabbit.jackrabbit.classpath"/>
+ <path refid="slf4j.slf4j.classpath"/>
+ <path refid="sun.jaf.classpath"/>
+ <path refid="xdoclet.xdoclet.classpath"/>
+ <path refid="jcr.jcr.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
+ <path refid="antlr.antlr.classpath"/>
+ <path refid="asm.asm.classpath"/>
+ <path refid="cglib.cglib.classpath"/>
+ <path refid="hsqldb.hsqldb.classpath"/>
+ <path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-test.classpath"/>
+ <path refid="jboss.portal-server.classpath"/>
<pathelement location="${build.lib}/portal-cms-lib.jar"/>
<pathelement location="${build.resources}/portal-cms-sar"/>
<pathelement location="${build.resources}/test"/>
+ <pathelement location="${build.resources}/hibernate"/>
<pathelement location="${jboss.portal-test.root}/etc"/>
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </classpath>
- </junit>
-
- <junitreport todir="${build.reports}">
- <fileset dir="${build.testlog}">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames" todir="${build.reports}/html"/>
- </junitreport>
-
- <echo>*** Report available at ${build.reports}/html/index.html ***</echo>
+ </x-classpath>
+ </execute-tests>
</target>
</project>
More information about the jboss-cvs-commits
mailing list