ilene 2002/11/15 15:18:46
Modified: test/java/src/org/apache/qetest/xsl XSLTestAntTask.java
XSLTestAntTask.class
test build.xml
Log:
Committing Gordon Chiu's ([EMAIL PROTECTED]) patch for smoketest
failures with JDK1.4. (bugzilla #14462)
Revision Changes Path
1.5 +19 -2
xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestAntTask.java
Index: XSLTestAntTask.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestAntTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSLTestAntTask.java 14 Aug 2001 17:20:42 -0000 1.4
+++ XSLTestAntTask.java 15 Nov 2002 23:18:45 -0000 1.5
@@ -767,4 +767,21 @@
{
commandLineJava.clearJavaArgs();
}
+
+ /**
+ * Set the bootclasspathref to be used for this test.
+ *
+ * @param s bootclasspathref used for running the test
+ */
+ public void setBootclasspathref(Reference r)
+ {
+ // This is a hack.
+ // On JDK 1.4.x we need to bootclasspath to override
+ // the Xalan/Xerces in rt.jar.
+ if (System.getProperty("java.version",
"0.0").substring(0,3).equals("1.4")) {
+ Path p = (Path)r.getReferencedObject(this.getProject());
+ log("Bootclasspath: " + p);
+ createJvmarg().setValue("-Xbootclasspath/p:" + p);
+ }
+ }
}
1.5 +111 -103
xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestAntTask.class
<<Binary file>>
1.56 +23 -2 xml-xalan/test/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- build.xml 28 Oct 2002 16:53:01 -0000 1.55
+++ build.xml 15 Nov 2002 23:18:45 -0000 1.56
@@ -154,6 +154,16 @@
<pathelement location="${jtidy.jar}" />
</path>
+ <!-- Boot class path for JDK 1.4. Order is important to ensure
+ GUMP builds work correctly, and people who don't use the
+ build.bat/build.sh can still build on JDK 1.4 as normal. -->
+ <path id="boot.class.path">
+ <pathelement location="${xalan.jar}" />
+ <pathelement location="${java.class.path}" />
+ <pathelement location="${xml-apis.jar}" />
+ <pathelement location="${parserjar}" />
+ </path>
+
<!-- Classpath used when running perf or performance tests -->
<path id="perf.class.path">
<path refid="conf.class.path" />
@@ -250,6 +260,7 @@
<xalantest test="${testClass}"
testType="${testType}"
classpathref="conf.class.path"
+ bootclasspathref="boot.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
<antcall target="scan">
@@ -286,6 +297,7 @@
<xalantest test="${testClass}"
testType="${testType}"
classpathref="conf.class.path"
+ bootclasspathref="boot.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
<antcall target="scan">
@@ -304,6 +316,7 @@
<xalantest test="${testClass}"
testType="${testType}"
classpathref="perf.class.path"
+ bootclasspathref="boot.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
<antcall target="scan">
@@ -322,6 +335,7 @@
<xalantest test="${testClass}"
testType="${testType}"
classpathref="contrib.class.path"
+ bootclasspathref="boot.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
<antcall target="scan">
@@ -341,6 +355,7 @@
<xalantest test="${testClass}"
testType="${testType}"
classpathref="api.class.path"
+ bootclasspathref="boot.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
</target>
@@ -357,6 +372,7 @@
<xalantest test="${testClass}"
testType="${testType}"
classpathref="api.class.path"
+ bootclasspathref="boot.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
<antcall target="scan">
@@ -391,6 +407,7 @@
<xalantest test="${testClass}"
testType="${testType}"
classpathref="bugzilla.class.path"
+ bootclasspathref="boot.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
<echo message="If you got ClassNotFound, did you 'build
bugzilla.classes' first?" />
@@ -410,6 +427,7 @@
<xalantest test="${testClass}"
testType="${testType}"
classpathref="extensions.class.path"
+ bootclasspathref="boot.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
<echo message="If you got ClassNotFound, did you 'build
extensions.classes' first?" />
@@ -1166,6 +1184,7 @@
<xalantest test="${testClass}"
testType="${testType}"
classpathref="xsltc.runtime.class.path"
+ bootclasspathref="boot.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}">
<!-- Explicitly set TransformerFactory property to use xsltc -->
@@ -1185,6 +1204,7 @@
<xalantest test="${testClass}"
testType="${testType}"
classpathref="xsltc.runtime.class.path"
+ bootclasspathref="boot.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}">
<!-- Explicitly set TransformerFactory property to use xsltc -->
@@ -1227,6 +1247,7 @@
<xalantest test="${testClass}"
testType="${testType}"
classpathref="xsltc.compile.class.path"
+ bootclasspathref="boot.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}">
<!-- Explicitly set TransformerFactory property to use xsltc -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
