amiro 2002/06/21 07:32:48
Modified: test build.xml
Log:
updated build.xml to enable XSLTC use of Jtidy in test comparator and to
clean up paths to xsltc jar; only the bundled xsltc.jar is needed
Revision Changes Path
1.51 +17 -15 xml-xalan/test/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- build.xml 13 Jun 2002 19:22:50 -0000 1.50
+++ build.xml 21 Jun 2002 14:32:48 -0000 1.51
@@ -80,8 +80,10 @@
<property name="xsltc.jar" value="${xalan.build.dir}/xsltc.jar"/>
<property name="xml-apis.jar" value="${xalan.bin.dir}/xml-apis.jar"/>
<property name="parserjar" value="${xalan.bin.dir}/xercesImpl.jar"/>
- <property name="bcel.jar" value="${xalan.bin.dir}/BCEL.jar"/>
+ <property name="bcel.jar" value="${xalan.bin.dir}/BCEL.jar"/>
<property name="bsf.jar" value="${xalan.bin.dir}/bsf.jar"/>
+ <!-- JTidy is used by the XSLTC comparator -->
+ <property name="jtidy.jar" value="${xalan.bin.dir}/Tidy.jar"/>
<!-- The js.jar is for Javascript extensions tests; you must
get this .jar yourself. Feel free to reset the location.
-->
@@ -126,10 +128,11 @@
<path id="compiletest.class.path">
<pathelement path="${java.class.path}" />
<pathelement location="${xalan.jar}" />
- <pathelement location="${xsltc.jar}" />
- <pathelement location="${bcel.jar}" />
+ <pathelement location="${xsltc.jar}" />
+ <pathelement location="${bcel.jar}" />
<pathelement location="${xml-apis.jar}" />
<pathelement location="${parserjar}" />
+ <pathelement location="${jtidy.jar}" />
</path>
<!-- Classpath used when running API tests -->
@@ -139,6 +142,7 @@
<pathelement location="${xml-apis.jar}" />
<pathelement location="${parserjar}" />
<pathelement location="${testxsl.jar}" />
+ <pathelement location="${jtidy.jar}" />
</path>
<!-- Classpath used when running conf or conformance tests -->
@@ -148,6 +152,7 @@
<pathelement location="${xml-apis.jar}" />
<pathelement location="${parserjar}" />
<pathelement location="${testxsl.jar}" />
+ <pathelement location="${jtidy.jar}" />
</path>
<!-- Classpath used when running perf or performance tests -->
@@ -264,6 +269,13 @@
<param name="testClass"
value="org.apache.qetest.xsl.StylesheetDriver" />
</antcall>
</target>
+ <target name="conf.xsltc.dom" description="Run TestletDriver over conf
with DOMs">
+ <antcall target="conf.xsltc">
+ <param name="conf.xsltc.excludes" value="${trax.dom.excludes}"/>
+ <param name="conf.xsltc.flavor" value="trax.dom"/>
+ </antcall>
+ </target>
+
<!-- ==================================================================
-->
<!-- Run tests: the StylesheetErrorTestlet on the conferr suite
-->
@@ -1038,28 +1050,18 @@
<path id="xsltc.runtime.class.path">
<pathelement path="${java.class.path}" />
<pathelement location="${xalan.build.dir}/xsltc.jar" />
- <pathelement location="${xalan.build.dir}/xalan.jar" />
- <pathelement location="${xalan.bin.dir}/BCEL.jar" />
- <pathelement location="${xalan.bin.dir}/JLex.jar" />
- <pathelement location="${xalan.bin.dir}/java_cup.jar" />
- <pathelement location="${xalan.bin.dir}/runtime.jar" />
- <pathelement location="${xalan.bin.dir}/regexp.jar" />
<pathelement location="${testxsl.jar}" />
<pathelement location="${parserjar}" />
<pathelement location="${xml-apis.jar}" />
+ <pathelement location="${xalan.bin.dir}/Tidy.jar" />
</path>
- <!-- xsltc-folk: are these the correct classpaths needed? -->
<path id="xsltc.compile.class.path">
<pathelement path="${java.class.path}" />
<pathelement location="${xalan.build.dir}/xsltc.jar" />
- <pathelement location="${xalan.bin.dir}/BCEL.jar" />
- <pathelement location="${xalan.bin.dir}/JLex.jar" />
- <pathelement location="${xalan.bin.dir}/java_cup.jar" />
- <pathelement location="${xalan.bin.dir}/runtime.jar" />
- <pathelement location="${xalan.bin.dir}/regexp.jar" />
<pathelement location="${testxsl.jar}" />
<pathelement location="${parserjar}" />
<pathelement location="${xml-apis.jar}" />
+ <pathelement location="${xalan.bin.dir}/Tidy.jar" />
<!-- Note addition of . to the classpath to enable loading
of translets; this needs more work and coordination
with tests and translet output dirs.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
