You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/01/06 20:20:37 UTC

cvs commit: xml-fop build.properties build.xml

jeremias    2005/01/06 11:20:37

  Modified:    .        build.properties build.xml
  Log:
  Fork JUnit test in new VM. (Maybe this fixes classpath problems with commons-logging when Xalan compiles again).
  Added layout engine tests specifying a default exclusion file.
  To disable the exclusion file add the following line to your build-local.properties:
  layoutengine.disabled=
  
  Revision  Changes    Path
  1.3       +6 -0      xml-fop/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.properties	4 Jul 2003 20:54:17 -0000	1.2
  +++ build.properties	6 Jan 2005 19:20:37 -0000	1.3
  @@ -4,6 +4,12 @@
   # output format for "ant examples"
   build.property.examples.mime.type = application/pdf
   
  +# decides if JUnit test shall be forked
  +junit.fork = on
  +
  +# specifies the default file that contains a list of disabled layout engine tests.
  +layoutengine.disabled=test/layoutengine/disabled-testcases.txt
  +
   # directory for optional-lib (so there is no need to copy the jar into
   # the fop/lib directory
   # optional.lib.dir = <Optional Lib Directory>
  
  
  
  1.112     +25 -6     xml-fop/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-fop/build.xml,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- build.xml	11 Oct 2004 21:52:26 -0000	1.111
  +++ build.xml	6 Jan 2005 19:20:37 -0000	1.112
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   <!--
  -  Copyright 1999-2004 The Apache Software Foundation
  +  Copyright 1999-2005 The Apache Software Foundation
   
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
  @@ -168,7 +168,7 @@
       <property name="NAME" value="FOP"/>
       <property name="version" value="1.0dev"/>
       <filter token="version" value="${version}"/>
  -    <property name="year" value="1999-2004"/>
  +    <property name="year" value="1999-2005"/>
   
       <echo message="------------------- ${Name} ${version} [${year}] ----------------"/>
       <echo message="See build.properties and build-local.properties for additional build settings"/>
  @@ -177,7 +177,7 @@
       <property name="debug" value="on"/>
       <property name="optimize" value="off"/>
       <property name="deprecation" value="on"/>
  -
  +    
       <property name="textfontencoding" value="WinAnsiEncoding"/>
   
       <property name="src.dir" value="${basedir}/src"/>
  @@ -673,7 +673,7 @@
       </javac>
       <echo message="Running basic functionality tests for fop-transcoder.jar"/>
       <mkdir dir="${build.dir}/test-reports/fop-transcoder"/>
  -    <junit haltonerror="yes">
  +    <junit haltonerror="yes" fork="${junit.fork}">
         <sysproperty key="basedir" value="${basedir}"/>
         <formatter type="brief" usefile="false"/>
         <classpath>
  @@ -691,7 +691,7 @@
       </junit>
       <echo message="Running basic functionality tests for fop-transcoder-allinone.jar"/>
       <mkdir dir="${build.dir}/test-reports/fop-transcoder-allinone"/>
  -    <junit haltonerror="yes">
  +    <junit haltonerror="yes" fork="${junit.fork}">
         <sysproperty key="basedir" value="${basedir}"/>
         <formatter type="brief" usefile="false"/>
         <classpath>
  @@ -711,7 +711,7 @@
       </junit>
       <echo message="Running basic functionality tests for fop.jar"/>
       <mkdir dir="${build.dir}/test-reports/fop"/>
  -    <junit haltonerror="yes">
  +    <junit haltonerror="yes" fork="${junit.fork}">
         <sysproperty key="basedir" value="${basedir}"/>
         <formatter type="brief" usefile="false"/>
         <classpath>
  @@ -725,6 +725,25 @@
           <fileset dir="${build.dir}/test-classes">
             <include name="org/apache/fop/BasicDriverTestSuite.class"/>
             <include name="org/apache/fop/UtilityCodeTestSuite.class"/>
  +        </fileset>
  +      </batchtest>
  +    </junit>
  +    <echo message="Running layout engine tests"/>
  +    <mkdir dir="${build.dir}/test-reports/fop"/>
  +    <junit haltonerror="yes" fork="${junit.fork}">
  +      <sysproperty key="basedir" value="${basedir}"/>
  +      <sysproperty key="fop.layoutengine.disabled" value="${layoutengine.disabled}"/>
  +      <formatter type="brief" usefile="false"/>
  +      <classpath>
  +        <pathelement location="${build.dir}/test-classes"/>
  +        <path refid="libs-build-classpath"/>
  +        <fileset dir="build">
  +          <include name="fop.jar"/>
  +        </fileset>
  +      </classpath>
  +      <batchtest todir="${build.dir}/test-reports/fop">
  +        <fileset dir="${build.dir}/test-classes">
  +          <include name="org/apache/fop/layoutengine/LayoutEngineTestSuite.class"/>
           </fileset>
         </batchtest>
       </junit>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org