You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mu...@apache.org on 2023/01/29 05:46:57 UTC
[xalan-java] branch xalan-j_2_7_1_maint updated: committing improvements to, xalanj build configuration. updating the, readme file as well, reflecting the updated xalanj build and tests configuration.
This is an automated email from the ASF dual-hosted git repository.
mukulg pushed a commit to branch xalan-j_2_7_1_maint
in repository https://gitbox.apache.org/repos/asf/xalan-java.git
The following commit(s) were added to refs/heads/xalan-j_2_7_1_maint by this push:
new f2248622 committing improvements to, xalanj build configuration. updating the, readme file as well, reflecting the updated xalanj build and tests configuration.
f2248622 is described below
commit f224862253d50fe77217becdb37a3f49c1001455
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Sun Jan 29 11:16:42 2023 +0530
committing improvements to, xalanj build configuration. updating the,
readme file as well, reflecting the updated xalanj build and tests
configuration.
---
README | 24 +++--------
build.bat | 4 +-
build_srcdist_xalan_tests.xml | 97 +++++++++++++++++++++++++++----------------
3 files changed, 70 insertions(+), 55 deletions(-)
diff --git a/README b/README
index e8380b11..e13851bb 100644
--- a/README
+++ b/README
@@ -79,7 +79,7 @@ the file testxsl.jar that acts as main XalanJ test driver, within folder xalan-t
4) Run the necessary XalanJ tests as follows,
-The tests described below within points 4.1, 4.2, 4.3 and 4.4 need to be run from folder xalan-test.
+The tests described below within points 4.1, 4.2, 4.3 need to be run from folder xalan-test.
4.1 Run the ant target "smoketest", using following two commands in sequence shown below
@@ -101,29 +101,17 @@ The output of the command "build api" should be following, and without any other
apitest-pass:
[echo] [minitest] CONGRATULATIONS! The api tests passed!
-4.3 Run the ant target "smoketest.xsltc", using following three commands in sequence shown below
+4.3 Run the ant target "conf.xsltc", using the following command
build conf.xsltc
-build accept.xsltc
+The output of the above command, should have following at the end of build results,
-build smoketest.xsltc
+[minitest] COMPLETED, running the conf.xsltc tests (excluding the xsltc compile tests)
-The output of the command "build smoketest.xsltc" should be following, and without any other build errors,
-
-smoketest.xsltc-pass:
- [echo] [minitest] CONGRATULATIONS! The Smoketest passed!
-
-4.4 Run the ant target "smoketest.dev", using following command
-
-build smoketest.dev
-
-The output of the command "build smoketest.dev" should be following, and without any other build errors,
-
-smoketest-pass:
- [echo] [minitest] CONGRATULATIONS! The Smoketest passed!
+[minitest] CONGRATULATIONS! The xsltc compile tests have passed!
-4.5 From folder xalan-test/tests/xsltc_integer_truncation, run the batch file
+4.4 From folder xalan-test/tests/xsltc_integer_truncation, run the batch file
xsltc_int_truncation_test.bat (provided for Windows platform) to run test for,
"XalanJ integer truncation bug fix, when using XSLTC".
\ No newline at end of file
diff --git a/build.bat b/build.bat
index 9eb1e64c..1cf49e11 100644
--- a/build.bat
+++ b/build.bat
@@ -49,8 +49,10 @@ if exist "%_ANT_HOME%\tools\ant.jar" (
set _CLASSPATH=%_CLASSPATH%;%_ANT_JARS%
+set XERCES_ENDORSED_DIR_PATH=lib\endorsed
+
@echo on
-"%_JAVACMD%" -mx1024m -classpath "%_CLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
+"%_JAVACMD%" -mx1024m -Djava.endorsed.dirs=%XERCES_ENDORSED_DIR_PATH% -classpath "%_CLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off
goto end
diff --git a/build_srcdist_xalan_tests.xml b/build_srcdist_xalan_tests.xml
index 202dde42..7caf1b5a 100644
--- a/build_srcdist_xalan_tests.xml
+++ b/build_srcdist_xalan_tests.xml
@@ -194,13 +194,14 @@ file build.xml provided by XalanJ xalan-test git repos.
</path>
<!-- Boot class path for JDK 1.4+ -->
- <path id="boot.class.path">
- <pathelement location="${xalan.jar}" />
- <pathelement location="${xsltc.jar}" /> <!-- add this so we can test the
- separate jar distribution -->
- <pathelement location="${ser.jar}" />
+ <path id="boot.class.path">
<pathelement location="${xml-apis.jar}" />
<pathelement location="${parserjar}" />
+ <pathelement location="${ser.jar}" />
+ <pathelement location="${xalan.jar}" />
+ <!--<pathelement location="${xsltc.jar}" />--> <!-- add this so we can test the
+ separate jar distribution -->
+ <pathelement path="${sun.boot.class.path}" />
</path>
<!-- Gump build xml-xalan2-smoketest should use xalan.unbundled.jar -->
@@ -265,13 +266,22 @@ file build.xml provided by XalanJ xalan-test git repos.
</taskdef>
<!-- This Ant task checks, the 'api' tests pass or fail status, by inspecting
- content within test result XML documents. -->
+ content within test result XML documents -->
<taskdef name="apiTestsResultTask" classname="org.apache.qetest.xsl.XSLApiTestsResultTask">
- <classpath>
- <pathelement location="${test.src.dir}" />
- <pathelement location="${test.build.dir}" />
- <pathelement location="${testxsl.jar}" />
- </classpath>
+ <classpath>
+ <pathelement location="${test.src.dir}" />
+ <pathelement location="${test.build.dir}" />
+ <pathelement location="${testxsl.jar}" />
+ </classpath>
+ </taskdef>
+
+ <!-- This Ant task, runs XalanJ xsltc tests -->
+ <taskdef name="xsltcTestsTask" classname="org.apache.qetest.xsl.XsltcTestsTask">
+ <classpath>
+ <pathelement location="${test.src.dir}" />
+ <pathelement location="${test.build.dir}" />
+ <pathelement location="${testxsl.jar}" />
+ </classpath>
</taskdef>
<!-- ================================================================== -->
@@ -516,13 +526,13 @@ file build.xml provided by XalanJ xalan-test git repos.
<antcall target="scan"/>
</target>
- <target name="accept.xsltc" description="Run TestletDriver over the accept tree">
+ <!--<target name="accept.xsltc" description="Run TestletDriver over the accept tree">
<property name="testType" value="accept.xsltc." />
<property name="qetest.summaryFile" value="Accept.xml" />
<property name="scan.outputDir" value="${accept.xsltc.outputDir}"/>
<property name="use-processor" value="${accept.xsltc.processor}"/>
<antcall target="conf.xsltc" />
- </target>
+ </target>-->
<target name="accept.trace" description="Run TestletDriver over the accept tree">
<property name="accept.trace" value="on"/>
@@ -822,15 +832,17 @@ file build.xml provided by XalanJ xalan-test git repos.
description="Run the Xalan-J 2.x XSLTC Smoketest"
depends="jar,smoketest.xsltc-execute,smoketest.xsltc-notpass,smoketest.xsltc-pass">
</target>
+
+ <!-- The following compiles the minimum to run the smoketests, runs them,
+ and creates distros just of the results and existing tree,
+ without actually running the docs - this is to ensure that
+ doc build errors in the tests won't affect GUMP runs.
+ -->
<target name="smoketest.dev"
description="Run the Xalan-J 2.x Smoketest with dependencies"
depends="jar,minitest-execute,extensions.classes,smoketest-execute,minitest-notpass,minitest-pass,smoketest-notpass,smoketest-pass">
- <!-- This compiles the minimum to run the smoketests, runs them,
- and creates distros just of the results and existing tree,
- without actually running the docs - this is to ensure that
- doc build errors in the tests won't affect GUMP runs.
- -->
</target>
+
<target name="smoketest.gump"
description="Run the Xalan-J 2.x Smoketest in automated builds with dependencies">
<antcall target="minitest.gump">
@@ -1682,24 +1694,37 @@ file build.xml provided by XalanJ xalan-test git repos.
<pathelement location="." />
</path>
- <target name="conf.xsltc" description="Run TestletDriver over the conf tree using xsltc">
- <!-- Set the default conformance test driver, user may override -->
- <property name="testClass" value="org.apache.qetest.xsl.StylesheetTestletDriver" />
- <echo message="Executing Xalan-xsltc conf test: ${testClass}" />
- <!-- Special: allow explicit test.properties overrides for inputDir, etc for xsltc -->
- <property name="testType" value="conf.xsltc." />
- <!-- Set indent-number to 0 to match Xalan's default indentation -->
- <property name="${testType}Processor.setAttribute.indent-number" value="0"/>
- <antcall target="run.xalantest">
- <param name="xalantest.classpathref"
- value="xsltc.runtime.class.path" />
- <!-- Explicitly set TransformerFactory property to use xsltc -->
- <param name="sysprop.transfact"
- value="org.apache.xalan.xsltc.trax.TransformerFactoryImpl" />
- </antcall>
- <property name="scan.outputDir" value="${conf.xsltc.outputDir}"/>
- <antcall target="scan" />
- </target>
+ <target name="conf.xsltc" description="Run TestletDriver over the conf tree using xsltc">
+ <!-- Set the default conformance test driver, user may override -->
+ <property name="testClass" value="org.apache.qetest.xsl.StylesheetTestletDriver" />
+ <echo message="Executing Xalan-xsltc conf test: ${testClass}" />
+ <!-- Special: allow explicit test.properties overrides for inputDir, etc for xsltc -->
+ <property name="testType" value="conf.xsltc." />
+ <!-- Set indent-number to 0 to match Xalan's default indentation -->
+ <property name="${testType}Processor.setAttribute.indent-number" value="0"/>
+ <antcall target="run.xalantest">
+ <param name="xalantest.classpathref"
+ value="xsltc.runtime.class.path" />
+ <!-- Explicitly set TransformerFactory property to use xsltc -->
+ <param name="sysprop.transfact"
+ value="org.apache.xalan.xsltc.trax.TransformerFactoryImpl" />
+ </antcall>
+ <property name="scan.outputDir" value="${conf.xsltc.outputDir}"/>
+ <antcall target="scan" />
+
+ <echo message=" [minitest] COMPLETED, running the conf.xsltc tests (excluding the xsltc compile tests)" />
+ <echo message=""/>
+
+ <mkdir dir="results-xsltc-compile-tests"/>
+
+ <xsltcTestsTask inputDir="tests/xsltc/attribset"
+ resultDir="results-xsltc-compile-tests"
+ bootclasspathref="boot.class.path"/>
+
+ <echo message=""/>
+ <echo message=" [minitest] CONGRATULATIONS! The xsltc compile tests have passed!" />
+ <echo message=" [minitest] See details of the xsltc compile tests results, at results-xsltc-compile-tests/actual_test_results.xml" />
+ </target>
<target name="perf.xsltc" description="Run TestletDriver over the perf tree using xsltc">
<!-- Set the default conformance test driver, user may override -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org