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/16 00:19:00 UTC
cvs commit: xml-xalan/test build.xml conf.bat contribtest.bat perf.bat test.properties threads.bat
curcuru 01/08/15 15:18:59
Modified: test build.xml conf.bat contribtest.bat perf.bat
test.properties threads.bat
Log:
Update convenience batch files to use new build.xml to run tests;
also update threads.bat to use threads. properties in new build.xml way
Revision Changes Path
1.14 +17 -0 xml-xalan/test/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 2001/08/14 20:12:55 1.13
+++ build.xml 2001/08/15 22:18:59 1.14
@@ -266,6 +266,23 @@
</target>
<!-- ================================================================== -->
+ <!-- Run tests: the ThreadedTestletDriver on threads.filelist -->
+ <!-- ================================================================== -->
+ <target name="threads" description="Run ThreadedTestletDriver on threads.filelist"
+ depends="init.test">
+ <!-- Set special threaded test driver and filelist, user may override -->
+ <property name="testClass" value="org.apache.qetest.xsl.ThreadedTestletDriver" />
+ <echo message="Executing Xalan threads test: ${testClass}" />
+ <property name="testType" value="threads." />
+ <xalantest test="${testClass}"
+ testType="${testType}"
+ classpathref="api.class.path"
+ fork="${fork-tests}"
+ failonerror="${fail-on-error}" />
+ </target>
+
+
+ <!-- ================================================================== -->
<!-- Run tests: a specific named API test -->
<!-- ================================================================== -->
<target name="api" description="Run a specific API test"
1.3 +3 -14 xml-xalan/test/conf.bat
Index: conf.bat
===================================================================
RCS file: /home/cvs/xml-xalan/test/conf.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- conf.bat 2001/03/15 22:23:53 1.2
+++ conf.bat 2001/08/15 22:18:59 1.3
@@ -3,21 +3,10 @@
@REM Name: conf.bat
@REM Author: Shane_Curcuru@lotus.com
@REM Simple wrapper to run StylesheetTestletDriver over tests\conf
+@REM See build.bat/.xml for how to pass -Dqetest.foo=bar options
:start
-@REM Pass along -crimson if it's the first arg
-if '%1' == '-crimson' set DASHCRIMSON=-crimson
-if '%1' == '-crimson' shift
-set END_PKG=xsl
-@echo Wrapper using '%DASHCRIMSON% xsl.StylesheetTestletDriver -load conf.properties %1 %2 %3 %4 %5 %6 %7 %8 %9'
-call runtest.bat %DASHCRIMSON% StylesheetTestletDriver -load conf.properties %1 %2 %3 %4 %5 %6 %7 %8 %9
-set END_PKG=
+@echo Redirect to build.bat conf %1 %2 %3 %4 %5 %6 %7 %8 %9
+call build.bat %DASHCRIMSON% conf %1 %2 %3 %4 %5 %6 %7 %8 %9
-@REM Automatically attempt to style the results into HTML
-@REM Note that the summaryfile param appears to be resolved relative
-@REM to the output file, not the current dir (i.e. here,
-@REM it will go into the same dir as the results)
-call viewResults.bat %DASHCRIMSON% results-conf\results.xml results-conf\results.html -param summaryfile results.txt
-
:end
-set DASHCRIMSON=
1.3 +5 -11 xml-xalan/test/contribtest.bat
Index: contribtest.bat
===================================================================
RCS file: /home/cvs/xml-xalan/test/contribtest.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- contribtest.bat 2000/12/19 16:49:41 1.2
+++ contribtest.bat 2001/08/15 22:18:59 1.3
@@ -2,17 +2,11 @@
@goto start
@REM Name: contribtest.bat
@REM Author: Shane_Curcuru@lotus.com
-@REM Simple wrapper for runtest.bat to run the 'default'
-@REM Conformance test wrapper over the test/contrib
-@REM directory instead, along with any extra args provided
+@REM Simple wrapper to run StylesheetTestletDriver over tests\contrib
+@REM See build.bat/.xml for how to pass -Dqetest.foo=bar options
:start
-@REM Pass along -crimson if it's the first arg
-if '%1' == '-crimson' set DASHCRIMSON=-crimson
-if '%1' == '-crimson' shift
-set END_PKG=xsl
-@echo Wrapper using '%DASHCRIMSON% xsl.ConformanceTest -load ContribTest.properties'
-call runtest.bat %DASHCRIMSON% ConformanceTest -load ContribTest.properties %1 %2 %3 %4 %5 %6 %7 %8 %9
-set END_PKG=
-set DASHCRIMSON=
+@echo Redirect to build.bat contrib %1 %2 %3 %4 %5 %6 %7 %8 %9
+call build.bat %DASHCRIMSON% contrib %1 %2 %3 %4 %5 %6 %7 %8 %9
+
:end
1.2 +3 -12 xml-xalan/test/perf.bat
Index: perf.bat
===================================================================
RCS file: /home/cvs/xml-xalan/test/perf.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perf.bat 2001/02/27 15:11:57 1.1
+++ perf.bat 2001/08/15 22:18:59 1.2
@@ -3,24 +3,15 @@
@REM Name: perf.bat
@REM Author: Shane_Curcuru@lotus.com
@REM Simple wrapper to run StylesheetTestletDriver over tests\perf
+@REM See build.bat/.xml for how to pass -Dqetest.foo=bar options
:start
-@REM Pass along -crimson if it's the first arg
-if '%1' == '-crimson' set DASHCRIMSON=-crimson
-if '%1' == '-crimson' shift
-
@echo Currently defaulting JAVA_OPTS to include -mx64m for performance measurements
set SJAVA_OPTS=%JAVA_OPTS%
set JAVA_OPTS=-mx64m %JAVA_OPTS%
-
-set END_PKG=xsl
-@echo Wrapper using '%DASHCRIMSON% xsl.StylesheetTestletDriver -load perf.properties %1 %2 %3 %4 %5 %6 %7 %8 %9'
-call runtest.bat %DASHCRIMSON% StylesheetTestletDriver -load perf.properties %1 %2 %3 %4 %5 %6 %7 %8 %9
-set END_PKG=
-@REM Automatically attempt to style the results into HTML
-call viewResults.bat %DASHCRIMSON% results-perf\results.xml results-perf\results.html -param summaryfile results-perf\results.txt
+@echo Redirect to build.bat perf %1 %2 %3 %4 %5 %6 %7 %8 %9
+call build.bat %DASHCRIMSON% perf %1 %2 %3 %4 %5 %6 %7 %8 %9
:end
-set DASHCRIMSON=
set JAVA_OPTS=%SJAVA_OPTS%
1.10 +8 -0 xml-xalan/test/test.properties
Index: test.properties
===================================================================
RCS file: /home/cvs/xml-xalan/test/test.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- test.properties 2001/08/13 15:33:04 1.9
+++ test.properties 2001/08/15 22:18:59 1.10
@@ -125,6 +125,14 @@
harness.threads.testlet=org.apache.qetest.xsl.ThreadedStylesheetTestlet
harness.threads.fileList=threads.filelist
+#---- Special: used to run threaded tests, which use a specific fileList format ----
+threads.inputDir=tests/api
+threads.goldDir=tests/api
+threads.outputDir=results-threads/
+threads.logFile=results-threads/results.xml
+threads.fileList=threads.filelist
+threads.testlet=org.apache.qetest.xsl.ThreadedStylesheetTestlet
+
#---- Special: used to run bugzilla Testlets and tests ----
bugzilla.inputDir=tests/bugzilla
bugzilla.goldDir=tests/bugzilla
1.2 +3 -11 xml-xalan/test/threads.bat
Index: threads.bat
===================================================================
RCS file: /home/cvs/xml-xalan/test/threads.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- threads.bat 2001/06/15 17:49:10 1.1
+++ threads.bat 2001/08/15 22:18:59 1.2
@@ -4,18 +4,10 @@
@REM Author: Shane_Curcuru@lotus.com
@REM Simple wrapper to run ThreadedTestletDriver with
@REM threads.properties and threads.filelist
+@REM See build.bat/.xml for how to pass -Dqetest.foo=bar options
:start
-@REM Pass along -crimson if it's the first arg
-if '%1' == '-crimson' set DASHCRIMSON=-crimson
-if '%1' == '-crimson' shift
-set END_PKG=xsl
-@echo Wrapper using '%DASHCRIMSON% xsl.ThreadedTestletDriver -load threads.properties %1 %2 %3 %4 %5 %6 %7 %8 %9'
-call runtest.bat %DASHCRIMSON% ThreadedTestletDriver -load threads.properties %1 %2 %3 %4 %5 %6 %7 %8 %9
-set END_PKG=
+@echo Redirect to build.bat threads %1 %2 %3 %4 %5 %6 %7 %8 %9
+call build.bat %DASHCRIMSON% threads %1 %2 %3 %4 %5 %6 %7 %8 %9
-@REM (Optional) Automatically attempt to style the results into HTML
-call viewResults.bat %DASHCRIMSON% results-threads\results.xml results-threads\results.html -param summaryfile results.txt
-
:end
-set DASHCRIMSON=
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org