jakarta-watchdog-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sant...@locus.apache.org
Subject cvs commit: jakarta-watchdog-4.0/src/bin watchdog.sh
Date Tue, 21 Nov 2000 04:12:14 GMT
santosh     00/11/20 20:12:14

  Modified:    src/bin  watchdog.sh
  Log:
  added a target to run the jsp tests against their XML view
  
  Revision  Changes    Path
  1.2       +31 -2     jakarta-watchdog-4.0/src/bin/watchdog.sh
  
  Index: watchdog.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/bin/watchdog.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- watchdog.sh	2000/10/03 22:29:55	1.1
  +++ watchdog.sh	2000/11/21 04:12:13	1.2
  @@ -4,7 +4,7 @@
   # Shell script to run watchdog test suite
    
   if [ "$1" = "" ] ; then
  -    echo usage: "$0 {all|jsp|servlet} [serverhost] [serverport]"
  +    echo usage: "$0 {all|jsp|jsp-xml|jsp-all|servlet} [serverhost] [serverport]"
       exit 0
   fi
   
  @@ -51,6 +51,10 @@
       exit 1
   fi
   
  +if [ "$JAKARTA_HOME" != "" ] ; then
  +   TOMCAT_HOME=${JAKARTA_HOME}/jakarta-tomcat-4.0
  +fi
  +
   
   cp=$CLASSPATH
   
  @@ -70,8 +74,18 @@
   
   echo Using classpath: ${CLASSPATH}
   echo
  +
  +if [ "${default}" = jsp -o "${default}" = all -o "${default}" = jsp-all ] ; then
  +
  +	if [ "$TOMCAT_HOME" = "" ] ; then
  +    java org.apache.tools.ant.Main -Dport=${PORT} -Dhost=${HOST} \
  +        -Dwatchdog.home=${WATCHDOG_HOME} -f ${WATCHDOG_HOME}/conf/jsp-gtest.xml jsp-test
  +        fi
   
  -if [ "${default}" = jsp -o "${default}" = all ] ; then
  +    echo "TOMCAT_HOME is " $TOMCAT_HOME
  +
  +    java org.apache.tools.ant.Main -Dport=${PORT} -Dhost=${HOST} \
  +        -Dtomcat.home=${TOMCAT_HOME} -f ${WATCHDOG_HOME}/conf/jsp-xml.xml jsp-test
       java org.apache.tools.ant.Main -Dport=${PORT} -Dhost=${HOST} \
           -Dwatchdog.home=${WATCHDOG_HOME} -f ${WATCHDOG_HOME}/conf/jsp-gtest.xml jsp-test
   fi
  @@ -85,6 +99,21 @@
       java org.apache.tools.ant.Main -Dport=${PORT} -Dhost=${HOST} \
           -Dwatchdog.home=${WATCHDOG_HOME} -f ${WATCHDOG_HOME}/conf/servlet-gtest.xml gtestservlet-test
   fi
  +
  +if [ "${default}" = jsp-xml -o "${default}" = all -o "${default}" = jsp-all ] ; then
  +	if [ "$TOMCAT_HOME" = "" ] ; then
  +        	echo TOMCAT_HOME not set, you need to set it or install in a standard location
  +    exit 1
  +	fi
  +    echo "TOMCAT_HOME is " $TOMCAT_HOME
  +    echo "Running JSP tests with the XML view of jsp pages......"
  +
  +    java org.apache.tools.ant.Main -Dport=${PORT} -Dhost=${HOST} \
  +        -Dtomcat.home=${TOMCAT_HOME} -f ${WATCHDOG_HOME}/conf/jsp-xml.xml xml-test
  +    java org.apache.tools.ant.Main -Dport=${PORT} -Dhost=${HOST} \
  +        -Dwatchdog.home=${WATCHDOG_HOME} -f ${WATCHDOG_HOME}/conf/jsp-gtest.xml jsp-test
  +fi
  +
   
   if [ "$cp" != "" ] ; then
       CLASSPATH=${cp}
  
  
  

Mime
View raw message