aboutsummaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorVincent Hennebert <vhennebert@apache.org>2007-02-14 14:24:36 +0000
committerVincent Hennebert <vhennebert@apache.org>2007-02-14 14:24:36 +0000
commit404013f30e23b12ab477650846eb0e65b58a1394 (patch)
tree68d16c7870a4a6beb3ea5c07f02a4bf46c5f8610 /build.xml
parentdfb9bf9c3a9d1300d1575a9151580208f1ed994f (diff)
downloadxmlgraphics-fop-404013f30e23b12ab477650846eb0e65b58a1394.tar.gz
xmlgraphics-fop-404013f30e23b12ab477650846eb0e65b58a1394.zip
Stricter user config file validation.
Add a configuration parameter (strict-configuration), enabled by default, which makes FOP throw an exception instead of logging an error when a problem occurs. Invalid resource paths should be catched now. Fixes bug #40120. Submitted by: Adrian Cumiskey (fop-dev AT cumiskey DOT com) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@507539 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml21
1 files changed, 20 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index 60d6537ae..cbb4276b6 100644
--- a/build.xml
+++ b/build.xml
@@ -776,6 +776,7 @@ list of possible build targets.
<formatter type="xml" usefile="true"/>
<classpath>
<pathelement location="${build.dir}/test-classes"/>
+ <path refid="libs-build-classpath"/>
<fileset dir="build">
<include name="fop-transcoder-allinone.jar"/>
</fileset>
@@ -789,6 +790,24 @@ list of possible build targets.
</junit>
</target>
+ <target name="junit-userconfig" depends="junit-compile" if="junit.present" description="Runs FOP's user config JUnit tests">
+ <echo message="Running user config tests"/>
+ <junit dir="${basedir}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}" errorproperty="fop.junit.error" failureproperty="fop.junit.failure">
+ <sysproperty key="basedir" value="${basedir}"/>
+ <sysproperty key="jawa.awt.headless" value="true"/>
+ <sysproperty key="fop.layoutengine.disabled" value="${layoutengine.disabled}"/>
+ <sysproperty key="fop.layoutengine.testset" value="standard"/>
+ <formatter type="brief" usefile="false"/>
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+ <classpath>
+ <pathelement location="${build.dir}/test-classes"/>
+ <path refid="libs-run-classpath"/>
+ </classpath>
+ <test name="org.apache.fop.config.UserConfigTestSuite" todir="${junit.reports.dir}" outfile="TEST-userconfig"/>
+ </junit>
+ </target>
+
<target name="junit-basic" depends="junit-compile" description="Runs FOP's JUnit basic tests" if="junit.present">
<echo message="Running basic functionality tests for fop.jar"/>
<junit dir="${basedir}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}" errorproperty="fop.junit.error" failureproperty="fop.junit.failure">
@@ -924,7 +943,7 @@ list of possible build targets.
</junit>
</target>
- <target name="junit" depends="junit-basic, junit-transcoder, junit-text-linebreak, junit-layout, junit-fotree, junit-intermediate-format" description="Runs all of FOP's JUnit tests" if="junit.present">
+ <target name="junit" depends="junit-userconfig, junit-basic, junit-transcoder, junit-text-linebreak, junit-layout, junit-fotree, junit-intermediate-format" description="Runs all of FOP's JUnit tests" if="junit.present">
<fail>
<condition>
<or>