generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new pid stuff, more filters, various fixes

Browse Source
This commit is contained in:
Daniel Stenberg 2000-11-13 09:43:40 +00:00
parent 69e82e7383
commit 27435f0648
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/runtests.sh
View File

@ -15,11 +15,15 @@ NC=nc
# Normally, all test cases should be run, but at times it is handy to # Normally, all test cases should be run, but at times it is handy to
# simply run a particular one: # simply run a particular one:
TESTCASES=" 1 2 3 4" TESTCASES="9"
#######################################################################
# No variables below this point should need to be modified
#
PIDFILE=".server.pid"
stopserver() { stopserver() {
PIDFILE="$LOGDIR/server.pid"
# check for pidfile # check for pidfile
if [ -f $PIDFILE ] ; then if [ -f $PIDFILE ] ; then
PID=`cat $PIDFILE` PID=`cat $PIDFILE`
@ -28,8 +32,6 @@ stopserver() {
} }
runserver () { runserver () {
PIDFILE="$LOGDIR/server.pid"
# check for pidfile # check for pidfile
if [ -f $PIDFILE ] ; then if [ -f $PIDFILE ] ; then
PID=`cat $PIDFILE` PID=`cat $PIDFILE`
@ -48,6 +50,8 @@ runserver () {
if [ $RUNNING != "1" ]; then if [ $RUNNING != "1" ]; then
./httpserver.pl $HOSTPORT & ./httpserver.pl $HOSTPORT &
sleep 1 # give it a little time to start sleep 1 # give it a little time to start
else
echo $STATUS
fi fi
} }
@ -89,18 +93,20 @@ singletest ()
echo "test $NUMBER... [$DESC]" echo "test $NUMBER... [$DESC]"
# get the command line options to use # get the command line options to use
cmd=`sed -e "s/%HOSTIP/$HOSTIP/g" -e "s/%HOSTPORT/$HOSTPORT/g" <$CURLCMD ` cmd=`sed -e "s/%HOSTIP/$HOSTIP/g" \
-e "s/%HOSTPORT/$HOSTPORT/g" \
-e "s/%HOSTNAME/$HOSTNAME/g" <$CURLCMD `
# run curl # run curl
CMDLINE="$CURL -o $CURLOUT -i --silent $cmd" CMDLINE="$CURL -o $CURLOUT -i --silent $cmd"
# we do it the eval way to deal with quotes and similar stuff
eval $CMDLINE
if test -n "$verbose"; then if test -n "$verbose"; then
echo "$CMDLINE" echo "$CMDLINE"
fi fi
# we do it the eval way to deal with quotes and similar stuff
eval $CMDLINE
if [ $? != "0" ]; then if [ $? != "0" ]; then
echo "Failed to invoke curl for test $NUMBER" echo "Failed to invoke curl for test $NUMBER"
else else
@ -114,7 +120,15 @@ singletest ()
fi fi
# verify the sent request # verify the sent request
compare $SERVERIN $HTTP " command" "User-Agent:" compare $SERVERIN $HTTP " command" \
"(User-Agent:|^--curl|Content-Type: multipart/form-data; boundary=)"
#
# The strip pattern above is for stripping off User-Agent: since that'll
# be different in all versions, and the lines in a RFC1876-post that are
# randomly generated and therefore are doomed to always differ!
#
if [ $? != "0" ]; then if [ $? != "0" ]; then
exit; exit;
@ -150,10 +164,11 @@ fi
# Output curl version being tested # Output curl version being tested
# #
VERSION=`$CURL -V` VERSION=`$CURL -V`
HOSTNAME=`hostname`
echo "Running tests on:" echo "Running tests on:"
echo $VERSION echo $VERSION
echo "" echo "host $HOSTNAME"
####################################################################### #######################################################################
# remove and recreate logging directory: # remove and recreate logging directory: