tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@hyperreal.org
Subject cvs commit: jakarta-tomcat/src/tests/bin runtest.bat runtest.sh
Date Fri, 15 Oct 1999 22:16:53 GMT
costin      99/10/15 15:16:52

  Modified:    src/tests/bin runtest.bat runtest.sh
  Log:
  Path fixes. Still testing...
  
  Revision  Changes    Path
  1.2       +5 -20     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- runtest.bat	1999/10/15 21:37:44	1.1
  +++ runtest.bat	1999/10/15 22:16:50	1.2
  @@ -1,5 +1,5 @@
   @echo off
  -rem $Id: runtest.bat,v 1.1 1999/10/15 21:37:44 costin Exp $
  +rem $Id: runtest.bat,v 1.2 1999/10/15 22:16:50 costin Exp $
   rem Startup batch file for servlet runner.
   
   rem This batch file written and tested under Windows NT
  @@ -9,21 +9,12 @@
   set port=8080
   set test=testlist.txt
   
  -set topDir=..\..\..
  -set tomcatBuildDir=%topDir%\build\tomcat
  -set toolsDir=%topDir%\jakarta-tools
  -
  -set jsdkJars=%tomcatBuildDir%\webserver.jar;%tomcatBuildDir%\lib\servlet.jar
  -set jspJars=%tomcatBuildDir%\lib\jasper.jar
  -set beanJars=
  -set miscJars=%toolsDir%\projectx-tr2.jar;%toolsDir%\moo.jar
  -set appJars=%jsdkJars%;%jspJars%;%miscJars%
  -set sysJars=%JAVA_HOME%\lib\tools.jar
  -
  -set appClassPath=.\classes;%appJars%
   set cp=%CLASSPATH%
  +
  +set CLASSPATH=classes;lib\moo.jar
   
  -set CLASSPATH=%appClassPath%;%sysJars%
  +set TOMCAT_HOME=..
  +%TOMCAT_HOME%\tomcatEnv.bat
   
   if "%cp%" == "" goto next
   
  @@ -46,12 +37,6 @@
   set port=
   set host=
   set test=
  -set jsdkJars=
  -set jspJars=
  -set beanJars=
  -set miscJars=
  -set appJars=
  -set appClassPath=
   set cp=
   
   rem pause
  
  
  
  1.2       +10 -17    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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- runtest.sh	1999/10/15 21:37:45	1.1
  +++ runtest.sh	1999/10/15 22:16:51	1.2
  @@ -1,6 +1,6 @@
  -#! /bin/sh
  +#! /bin/ksh
   #
  -# $Id: runtest.sh,v 1.1 1999/10/15 21:37:45 costin Exp $
  +# $Id: runtest.sh,v 1.2 1999/10/15 22:16:51 costin Exp $
   
   # Shell script to run test harness
    
  @@ -8,27 +8,20 @@
   port=8080
   test=testlist.txt
   
  -baseDir=../../..
  -tomcatBuildDir=$baseDir/build/tomcat
  -toolsDir=$baseDir/jakarta-tools
  -
  -jsdkJars=${tomcatBuildDir}/webserver.jar:${tomcatBuildDir}/lib/servlet.jar
  -jspJars=${tomcatBuildDir}/lib/jasper.jar
  -beanJars=
  -miscJars=${toolsDir}/projectx-tr2.jar:${toolsDir}/moo.jar
  -appJars=${jsdkJars}:${jspJars}:${miscJars}:${tomcatBuildDir}/classes
  -sysJars=${JAVA_HOME}/lib/tools.jar
  -
  -appClassPath=./classes:${appJars}
   cp=$CLASSPATH
   
  -CLASSPATH=${appClassPath}:${sysJars}
  -export CLASSPATH
  +CLASSPATH=classes:lib/moo.jar
   
   if [ "$cp" != "" ]; then
       CLASSPATH=${CLASSPATH}:${cp}
  -    export CLASSPATH
   fi
  +
  +
  +# Add tomcat-related classes
  +TOMCAT_HOME=..
  +. ${TOMCAT_HOME}/env.tomcat
  +
  +export CLASSPATH
   
   echo Using classpath: ${CLASSPATH}
   echo
  
  
  

Mime
View raw message