You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by cu...@apache.org on 2001/08/02 13:08:19 UTC
cvs commit: xml-xalan/test test.properties build.xml
curcuru 01/08/02 04:08:19
Modified: test test.properties build.xml
Log:
Add -pass,-notpass reporting targets for minitest and smoketest
Revision Changes Path
1.4 +4 -1 xml-xalan/test/test.properties
Index: test.properties
===================================================================
RCS file: /home/cvs/xml-xalan/test/test.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test.properties 2001/07/31 15:34:21 1.3
+++ test.properties 2001/08/02 11:08:19 1.4
@@ -98,17 +98,20 @@
smoketest.conf.goldDir=tests/conf-gold
smoketest.conf.outputDir=smoketest/conf
smoketest.conf.logFile=smoketest/results-conf.xml
+smoketest.conf.passFile=smoketest/Pass-StylesheetTestletDriver.xml
# Runs a selected set of known passing API tests
smoketest.api.tests=trax.Minitest;trax.TransformerAPITest;xalanj2.TransformStateTest
smoketest.api.inputDir=tests/api
smoketest.api.goldDir=tests/api-gold
-smoketest.api.outputDir=smoketest/
+smoketest.api.outputDir=smoketest/api
smoketest.api.logFile=smoketest/results-api.xml
+smoketest.conf.passFile=smoketest/Pass-Harness.xml
# Used by both the minitest and smoketest targets
minitest.inputDir=tests/api
minitest.goldDir=tests/api-gold
minitest.outputDir=smoketest/
minitest.logFile=smoketest/Minitest.xml
+minitest.passFile=smoketest/Pass-Minitest.xml
# A listing of all normal API tests currently available, except Minitest
# Note tests do not all include package names since they'll
1.5 +56 -15 xml-xalan/test/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2001/07/31 15:34:21 1.4
+++ build.xml 2001/08/02 11:08:19 1.5
@@ -271,38 +271,79 @@
<!-- ================================================================== -->
<!-- Run tests: Run the Xalan-J 2.x Minitest -->
<!-- ================================================================== -->
- <target name="minitest" description="Run the Xalan-J 2.x Minitest">
+ <!-- This target doesn't actually do anything itself - it merely
+ depends on other targets, in order, to first run the whole
+ Minitest, then to log to Ant whether the test didn't pass
+ (i.e. failed, incomplete, error or ambiguous) or passed.
+ -->
+ <target name="minitest"
+ description="Run the Xalan-J 2.x Minitest"
+ depends="minitest-execute,minitest-notpass,minitest-pass">
+ </target>
+
+ <target name="minitest-execute">
+ <echo message="About to execute the Minitest..." />
<antcall target="api">
<param name="testClass" value="org.apache.qetest.trax.Minitest"/>
+ <param name="testType" value="minitest."/>
</antcall>
+ <available file="${minitest.passfile}" property="minitest-passed" />
</target>
-
+ <target name="minitest-notpass" unless="minitest-passed">
+ <echo message=" [minitest] ERROR! The Minitest failed!" />
+ <echo message=" [minitest] See details in ${minitest.logFile}, output is in ${minitest.outputDir}" />
+ <echo message=" [minitest] Please fix any Minitest problems before checking in!" />
+ <fail message="Please fix any Minitest problems before checking in!" />
+ </target>
+ <target name="minitest-pass" if="minitest-passed">
+ <echo message=" [minitest] CONGRATULATIONS! The Minitest passed!" />
+ <echo message=" [minitest] See details in ${minitest.logFile}" />
+ </target>
<!-- ================================================================== -->
<!-- Run tests: Run the Xalan-J 2.x Smoketest, including several tests -->
<!-- Note: this target is frequently called from outside of this file! -->
<!-- ================================================================== -->
- <target name="smoketest" description="Run the Xalan-J 2.x Smoketest">
+ <target name="smoketest"
+ description="Run the Xalan-J 2.x Smoketest"
+ depends="minitest-execute,smoketest-execute,minitest-notpass,minitest-pass,smoketest-conf-notpass,smoketest-conf-pass,smoketest-api-notpass,smoketest-api-pass">
<echo message="About to execute the Minitest..." />
- <antcall target="api">
- <param name="testClass" value="org.apache.qetest.trax.Minitest"/>
- <param name="testType" value="minitest."/>
+ </target>
+
+ <target name="smoketest-execute">
+ <echo message="About to execute Conformance tests..." />
+ <antcall target="conf">
+ <param name="testType" value="smoketest.conf."/>
</antcall>
+ <available file="${smoketest.conf.passFile}" property="smoketest-conf-passed" />
+
<echo message="About to execute other API tests..." />
<antcall target="api">
<param name="testClass" value="org.apache.qetest.xsl.XSLTestHarness"/>
<param name="testType" value="smoketest.api."/>
- </antcall>
- <echo message="About to execute Conformance tests..." />
- <antcall target="conf">
- <param name="qetest.category" value="copy"/> <!-- HACK DEBUGGING -->
- <param name="testType" value="smoketest.conf."/>
</antcall>
- <!-- Now, evaluate the results to see if we should fail or not -->
- <!-- TBD -->
+ <available file="${smoketest.conf.passFile}" property="smoketest-conf-passed" />
</target>
-
-
+ <target name="smoketest-conf-notpass" unless="smoketest-conf-passed">
+ <echo message=" [minitest] ERROR! The Smoketest-conf failed!" />
+ <echo message=" [minitest] See details in ${smoketest.conf.logFile}, output is in ${smoketest.conf.outputDir}" />
+ <echo message=" [minitest] Please fix any conformance problems before checking in!" />
+ <fail message="Please fix any conformance problems before checking in!" />
+ </target>
+ <target name="smoketest-conf-pass" if="smoketest-conf-passed">
+ <echo message=" [minitest] CONGRATULATIONS! The Smoketest-conf passed!" />
+ <echo message=" [minitest] See details in ${smoketest.conf.logFile}" />
+ </target>
+ <target name="smoketest-api-notpass" unless="smoketest-api-passed">
+ <echo message=" [minitest] ERROR! The Smoketest-api failed!" />
+ <echo message=" [minitest] See details in ${smoketest.api.logFile}, output is in ${smoketest.api.outputDir}" />
+ <echo message=" [minitest] Please fix any API test problems before checking in!" />
+ <fail message="Please fix any API test problems before checking in!" />
+ </target>
+ <target name="smoketest-api-pass" if="smoketest-api-passed">
+ <echo message=" [minitest] CONGRATULATIONS! The Smoketest-api passed!" />
+ <echo message=" [minitest] See details in ${smoketest.api.logFile}" />
+ </target>
<!-- ================================================================== -->
<!-- Build Tests: Compile/jar targets for each 'layer' of testing code -->
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org