jakarta-watchdog-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@hyperreal.org
Subject cvs commit: jakarta-watchdog/src/bin runtest.sh
Date Fri, 12 Nov 1999 23:30:50 GMT
costin      99/11/12 15:30:47

  Modified:    .        build.sh build.xml
               src/bin  runtest.sh
  Log:
  - ksh -> sh
  - classpath is in build.xml
  - no deprecation ( messages )
  
  Revision  Changes    Path
  1.6       +3 -3      jakarta-watchdog/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog/build.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.sh	1999/11/11 22:13:02	1.5
  +++ build.sh	1999/11/12 23:30:24	1.6
  @@ -1,15 +1,15 @@
   #!/bin/sh
   #
  -# $Id: build.sh,v 1.5 1999/11/11 22:13:02 costin Exp $
  +# $Id: build.sh,v 1.6 1999/11/12 23:30:24 costin Exp $
   # Ksh wrapper around ant build system.
   
   baseDir=`pwd`
   
   echo $baseDir .....
   
  -ADDL_CLASSPATH=../build/tomcat/classes:../jakarta-tools/ant.jar:../jakarta-tools/moo.jar:../jakarta-tools/projectx-tr2.jar:../build/tomcat/lib/servlet.jar:../build/tomcat/lib/jasper.jar:../build/tomcat/lib/xml.jar
  +ADDL_CLASSPATH=../jakarta-tools/ant.jar:../jakarta-tools/projectx-tr2.jar
   
  -if [[ -n $CLASSPATH ]]; then
  +if [ -n $CLASSPATH ]; then
     CLASSPATH=$ADDL_CLASSPATH:$CLASSPATH
   else
     CLASSPATH=$ADDL_CLASSPATH
  
  
  
  1.18      +19 -5     jakarta-watchdog/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml	1999/11/11 22:13:09	1.17
  +++ build.xml	1999/11/12 23:30:29	1.18
  @@ -8,6 +8,7 @@
   
      <property name="watchdog.build" value="../build/watchdog"/>
      <property name="watchdog.dist" value="../dist/watchdog"/>
  +   <property name="watchdog-classpath" value="../jakarta-tools/moo.jar:../build/tomcat/classes"
/>
   
      <target name="prepare">
   
  @@ -41,16 +42,29 @@
      </target>       
      <target name="main" depends="prepare">
   
  +      <javac srcdir="src/server/servlet-tests/WEB-INF/classes"
  +             destdir="${watchdog.build}/webapps/servlet-tests/WEB-INF/classes"
  +             classpath="${watchdog-classpath}" 
  +             deprecation="off" />
  +
         <javac srcdir="src/server/jsp-tests/WEB-INF/classes"
  -             destdir="${watchdog.build}/webapps/jsp-tests/WEB-INF/classes"/>
  +             destdir="${watchdog.build}/webapps/jsp-tests/WEB-INF/classes"
  +             classpath="${watchdog-classpath}" 
  +             deprecation="off" />
   
         <!-- Something strange in J2EE, lib/moo.jar is not read - this is a temp. fix
-->
         <javac srcdir="../jakarta-tools/moo/src/share"
  -             destdir="${watchdog.build}/webapps/jsp-tests/WEB-INF/classes"/>
  +             destdir="${watchdog.build}/webapps/jsp-tests/WEB-INF/classes"
  +             classpath="${watchdog-classpath}" 
  +             deprecation="off" />
         <javac srcdir="../jakarta-tools/moo/src/share"
  -             destdir="${watchdog.build}/webapps/servlet-tests/WEB-INF/classes"/>
  -
  -      <javac srcdir="src/clients" destdir="${watchdog.build}/clients" />    
  +             destdir="${watchdog.build}/webapps/servlet-tests/WEB-INF/classes"
  +             classpath="${watchdog-classpath}" 
  +             deprecation="off" />
  +
  +      <javac srcdir="src/clients" destdir="${watchdog.build}/clients" 
  +             classpath="${watchdog-classpath}" 
  +             deprecation="off" />    
      </target>
   
      <target name="dist" depends="main">
  
  
  
  1.5       +2 -2      jakarta-watchdog/src/bin/runtest.sh
  
  Index: runtest.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog/src/bin/runtest.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- runtest.sh	1999/10/20 19:14:03	1.4
  +++ runtest.sh	1999/11/12 23:30:42	1.5
  @@ -1,6 +1,6 @@
   #! /bin/sh
   #
  -# $Id: runtest.sh,v 1.4 1999/10/20 19:14:03 vanitha Exp $
  +# $Id: runtest.sh,v 1.5 1999/11/12 23:30:42 costin Exp $
   
   # Shell script to run test harness
    
  @@ -58,7 +58,7 @@
   fi
   
   java org.apache.tomcat.shell.Startup -config $webconf  $* &
  -sleep 50
  +sleep 20
   
   if [ "${default}" = jsp -o "${default}" = all ];then
   java -Dtest.hostname=$host -Dtest.port=$port org.apache.tools.moo.Main \
  
  
  

Mime
View raw message