mkwan 2003/04/01 14:00:43
Modified: test build.xml test.properties
Log:
Merging XSLTC_DTM and common serializer to the head
Update test/build.xml and test.properties.
Revision Changes Path
1.60 +7 -38 xml-xalan/test/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- build.xml 18 Feb 2003 16:02:44 -0000 1.59
+++ build.xml 1 Apr 2003 22:00:43 -0000 1.60
@@ -128,8 +128,6 @@
<path id="compiletest.class.path">
<pathelement path="${java.class.path}" />
<pathelement location="${xalan.jar}" />
- <pathelement location="${xsltc.jar}" />
- <pathelement location="${bcel.jar}" />
<pathelement location="${xml-apis.jar}" />
<pathelement location="${parserjar}" />
<pathelement location="${jtidy.jar}" />
@@ -457,9 +455,8 @@
bootclasspathref="boot.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
- <antcall target="scan">
- <param name="scan.outputDir" value="${extensions.outputDir}"/>
- </antcall>
+ <property name="scan.outputDir" value="${extensions.outputDir}"/>
+ <antcall target="scan"/>
<echo message="If you got ClassNotFound, did you 'build
extensions.classes' first?" />
</target>
@@ -1104,8 +1101,7 @@
<!-- Note that this target must *not* depend on any XSLTC tests,
which have to be compiled separately; otherwise the
- smoketest will fail. Please see compile.xsltc and
- jar.xsltc targets instead.
+ smoketest will fail.
-->
<target name="jar" depends="compile"
description="Build testxsl.jar with all available tests">
@@ -1330,7 +1326,7 @@
<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="${testxsl.jar}" />
<pathelement location="${parserjar}" />
<pathelement location="${xml-apis.jar}" />
@@ -1338,7 +1334,7 @@
</path>
<path id="xsltc.compile.class.path">
<pathelement path="${java.class.path}" />
- <pathelement location="${xalan.build.dir}/xsltc.jar" />
+ <pathelement location="${xalan.build.dir}/xalan.jar" />
<pathelement location="${testxsl.jar}" />
<pathelement location="${parserjar}" />
<pathelement location="${xml-apis.jar}" />
@@ -1349,33 +1345,6 @@
-->
<pathelement location="." />
</path>
-
- <target name="compile.xsltc.xslwrappers" depends="compile.xsl"
- description="Compile Xsltc*Wrapper xslwrappers only">
- <javac srcdir="${test.src.dir}"
- destdir="${test.build.dir}"
-
includes="${test.root}xslwrapper/Trax*Wrapper.java,${test.root}xslwrapper/TraxWrapperUtils.java,${test.root}xslwrapper/Xsltc*Wrapper.java,${test.root}dtm/xsltcDocCode.java"
- debug="${debug}">
- <classpath refid="xsltc.compile.class.path" />
- </javac>
- </target>
-
- <target name="compile.xsltc" depends="compile.trax"
- description="Compile xsltc native API tests only">
- <javac srcdir="${test.src.dir}"
- destdir="${test.build.dir}"
- includes="${test.root}xsltc/*.java"
- debug="${debug}">
- <classpath refid="xsltc.compile.class.path" />
- </javac>
- </target>
-
- <target name="jar.xsltc" depends="compile.xsltc"
- description="Build testxsl.jar with xsltc-specific tests">
- <jar jarfile="${test.build.dir}/${testxsl.jar.name}"
- basedir="${test.build.dir}"
- includes="**/*.class,**/*.properties" />
- </target>
<target name="conf.xsltc" description="Run TestletDriver over the conf
tree using xsltc">
<!-- Set the default conformance test driver, user may override -->
1.95 +3 -4 xml-xalan/test/test.properties
Index: test.properties
===================================================================
RCS file: /home/cvs/xml-xalan/test/test.properties,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- test.properties 25 Mar 2003 20:41:01 -0000 1.94
+++ test.properties 1 Apr 2003 22:00:43 -0000 1.95
@@ -133,7 +133,6 @@
smoketest.conf.ConsoleLogger.loggingLevel=20
# Bugzilla5389 attribset40.xsl
# Bugzilla12690 axes62.xsl
-# Bugzilla12543 axes129.xsl
# Bugzilla10616 copy56.xsl;copy58.xsl;copy59.xsl;copy60.xsl
# Bugzilla6155 numberformat45.xsl;numberformat46.xsl
# Bugzilla7163 output97.xsl
@@ -141,7 +140,8 @@
# Bugzilla14862 idkey61.xsl;idkey62.xsl
# Bugzilla14999 idkey31.xsl
# Bugzilla17400 position112.xsl;position113.xsl
-smoketest.conf.normal.excludes=attribset40.xsl;axes62.xsl;axes129.xsl;copy56.xsl;copy58.xsl;copy59.xsl;copy60.xsl;idkey31.xsl;idkey61.xsl;idkey62.xsl;numberformat45.xsl;numberformat46.xsl;output97.xsl;position112.xsl;position113.xsl;select85.xsl
+# Bugzilla 18210 mdocs19.xsl
+smoketest.conf.normal.excludes=attribset40.xsl;axes62.xsl;copy56.xsl;copy58.xsl;copy59.xsl;copy60.xsl;idkey31.xsl;idkey61.xsl;idkey62.xsl;mdocs19.xsl;numberformat45.xsl;numberformat46.xsl;output97.xsl;position112.xsl;position113.xsl;select85.xsl
smoketest.conf.supplemental.excludes=
smoketest.extensions.excludes=javaBugzilla3722.xsl;libraryNodeset05.xsl;libraryNodeset06.xsl;libraryNodeset07.xsl;libraryNodeset08.xsl
@@ -207,13 +207,12 @@
# Bugzilla15327 position102.xsl;position103.xsl;position105.xsl
# Bugzilla15333 impincl28.xsl;impincl29.xsl
# Bugzilla15335 select85.xsl
-# Bugzilla 18210 mdocs19.xsl
# embed02.xml - testcase is actually passing; harness issue to be resolved
# attribset15,23.xsl are permitted to fail (discretionary item)
# excluding them for now until it's decided what to do with these tests
-smoketest.xsltc.conf.normal.excludes=sort15.xsl;axes62.xsl;copy56.xsl;copy58.xsl;copy59.xsl;copy60.xsl;copy09.xsl;mdocs19.xsl;output63.xsl;reluri11.xsl;attribset17.xsl;ver01.xsl;ver05.xsl;ver06.xsl;ver07.xsl;reluri09.xsl;attribset15.xsl;attribset23.xsl;idkey49.xsl;numberformat45.xsl;numberformat46.xsl;idkey31.xsl;namespace140.xsl;attribvaltemplate08.xsl;output04.xsl;output46.xsl;whitespace35.xsl;position102.xsl;position103.xsl;position105.xsl;axes120.xsl;impincl28.xsl;impincl29.xsl;select85.xsl;embed02.xml
+smoketest.xsltc.conf.normal.excludes=sort15.xsl;axes62.xsl;copy09.xsl;output63.xsl;reluri11.xsl;attribset17.xsl;ver01.xsl;ver05.xsl;ver06.xsl;ver07.xsl;reluri09.xsl;attribset15.xsl;attribset23.xsl;idkey49.xsl;numberformat45.xsl;numberformat46.xsl;idkey31.xsl;namespace140.xsl;attribvaltemplate08.xsl;output04.xsl;output46.xsl;whitespace35.xsl;position102.xsl;position103.xsl;position105.xsl;axes120.xsl;impincl28.xsl;impincl29.xsl;select85.xsl;embed02.xml
smoketest.xsltc.conf.supplemental.excludes=
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
