You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ru...@locus.apache.org on 2000/01/11 17:04:30 UTC
cvs commit: jakarta-tomcat/src/tests/bin runtest.bat runtest.sh test.xml
rubys 00/01/11 08:04:30
Modified: . build.xml
src/tests/bin runtest.bat runtest.sh test.xml
Log:
Update runtest.[sh|bat] to use new moo.RunTest
Revision Changes Path
1.18 +2 -0 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 1999/12/17 00:18:01 1.17
+++ build.xml 2000/01/11 16:04:28 1.18
@@ -141,6 +141,8 @@
dest="${tomcat.build}/test/testlist.txt"/>
<copyfile src="../jakarta-tools/moo.jar"
dest="${tomcat.build}/test/lib/moo.jar"/>
+ <copyfile src="../jakarta-tools/ant.jar"
+ dest="${tomcat.build}/test/lib/ant.jar"/>
<copyfile src="../jakarta-tools/moo.jar"
dest="${tomcat.build}/test/webpages/WEB-INF/lib/moo.jar"/>
1.6 +3 -7 jakarta-tomcat/src/tests/bin/runtest.bat
Index: runtest.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/tests/bin/runtest.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- runtest.bat 2000/01/02 04:11:05 1.5
+++ runtest.bat 2000/01/11 16:04:29 1.6
@@ -1,5 +1,5 @@
@echo off
-rem $Id: runtest.bat,v 1.5 2000/01/02 04:11:05 rubys Exp $
+rem $Id: runtest.bat,v 1.6 2000/01/11 16:04:29 rubys Exp $
rem Startup batch file for servlet runner.
rem This batch file written and tested under Windows NT
@@ -15,7 +15,7 @@
set cp=%CLASSPATH%
-set CLASSPATH=classes;lib\moo.jar;%miscJars%;%sysJars%
+set CLASSPATH=classes;lib\ant.jar;lib\moo.jar;%miscJars%;%sysJars%
set TOMCAT_HOME=..
set TOM_CLASSPATH=%TOMCAT_HOME%\webserver.jar;%TOM_CLASSPATH%
@@ -39,11 +39,7 @@
:next
echo Using classpath: %CLASSPATH%
-start java org.apache.tomcat.shell.Startup %1 %2 %3 %4 %5 %6 %7 %8 %9
-rem java org.apache.tomcat.shell.Startup %1 %2 %3 %4 %5 %6 %7 %8 %9
-sleep 5
-java -Dtest.hostName=%host% -Dtest.port=%port% org.apache.tools.moo.Main -testfile %test%
-java org.apache.tomcat.shell.Shutdown %1 %2 %3 %4 %5 %6 %7 %8 %9
+java org.apache.tools.ant.Main -f test.xml %1 %2 %3 %4 %5 %6 %7 %8 %9
rem clean up
1.8 +3 -8 jakarta-tomcat/src/tests/bin/runtest.sh
Index: runtest.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/tests/bin/runtest.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- runtest.sh 1999/12/15 20:31:13 1.7
+++ runtest.sh 2000/01/11 16:04:29 1.8
@@ -1,6 +1,6 @@
#! /bin/ksh
#
-# $Id: runtest.sh,v 1.7 1999/12/15 20:31:13 costin Exp $
+# $Id: runtest.sh,v 1.8 2000/01/11 16:04:29 rubys Exp $
# Shell script to run test harness
@@ -15,7 +15,7 @@
cp=$CLASSPATH
-CLASSPATH=classes:lib/moo.jar
+CLASSPATH=classes:lib/ant.jar:lib/moo.jar
if [ "$cp" != "" ]; then
CLASSPATH=${CLASSPATH}:${cp}
@@ -49,12 +49,7 @@
echo Using classpath: ${CLASSPATH}
echo
-#$JAVACMD org.apache.tomcat.shell.Startup "$@" &
-$TOMCAT_HOME/tomcat.sh start &
-sleep 25
-$JAVACMD -Dtest.hostname=$host -Dtest.port=$port org.apache.tools.moo.Main -testfile $test -debug
-$TOMCAT_HOME/tomcat.sh stop
-#$JAVACMD org.apache.tomcat.shell.Shutdown "$@"
+java org.apache.tools.ant.Main -f test.xml $@
if [ "$cp" != "" ]; then
CLASSPATH=${cp}
1.2 +18 -3 jakarta-tomcat/src/tests/bin/test.xml
Index: test.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/tests/bin/test.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test.xml 2000/01/10 20:33:05 1.1
+++ test.xml 2000/01/11 16:04:29 1.2
@@ -1,6 +1,15 @@
-<project name="TestRun" default="main" basedir=".">
+<project name="TestRun" default="main" basedir="." init="init">
- <target name="main">
+ <target name="init">
+ <property name="test.hostname" value="localhost" />
+ <property name="test.port" value="8080" />
+ </target>
+
+ <target name="startup">
+ <java class="org.apache.tomcat.shell.Startup" args="" />
+ </target>
+
+ <target name="client">
<!-- Need to mark the time, compute the diff at end -->
<java class="org.apache.tools.moo.RunTest" args="tests.file.FileLengthTest" />
<java class="org.apache.tools.moo.RunTest" args="tests.file.ContentTypeTest" />
@@ -21,9 +30,15 @@
<java class="org.apache.tools.moo.RunTest" args="tests.request.RequestMap" />
<java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp" />
</target>
+
+ <target name="shutdown">
+ <java class="org.apache.tomcat.shell.Startup" args="" />
+ </target>
+
+ <target name="main" depends="startup,client,shutdown" />
</project>
<!--
## tests.y2k.HttpDateTest
#tests.perf.CounterClient
--->
\ No newline at end of file
+-->