#!/bin/sh
-# $Id: test_http.sh,v 1.4 2007-05-16 08:31:17 adam Exp $
+# $Id: test_http.sh,v 1.10 2007-08-13 12:51:00 adam Exp $
#
# Regression test using pazpar2 against z3950.indexdata.com/marc
# Reads Pazpar2 URLs from test_http_urls
# srcdir might be set by make
srcdir=${srcdir:-"."}
-# Fire yp pazpar2
+wget=""
+lynx=""
+if test -x /usr/bin/wget; then
+ wget=/usr/bin/wget
+fi
+if test -x /usr/bin/lynx; then
+ lynx=/usr/bin/lynx
+fi
+
+# Fire up pazpar2
rm -f pazpar2.log
-../src/pazpar2 -l pazpar2.log -f ${srcdir}/test_http.cfg -t ${srcdir}/test_http.xml >extra_pazpar2.log 2>&1 &
+
+if test "$usevalgrind"; then
+ valgrind --log-file=valgrind ../src/pazpar2 -X -l pazpar2.log -f ${srcdir}/test_http.cfg -t ${srcdir}/test_http.xml >extra_pazpar2.log 2>&1 &
+else
+ ../src/pazpar2 -X -l pazpar2.log -f ${srcdir}/test_http.cfg -t ${srcdir}/test_http.xml >extra_pazpar2.log 2>&1 &
+fi
+
+
PP2PID=$!
# Give it a chance to start properly..
-sleep 1
+sleep 3
# Set to success by default.. Will be set to non-zero in case of failure
code=0
DIFF=test_http_${testno}.dif
if test -f $OUT1; then
rm -f $OUT2
- wget -q -O $OUT2 $f
+ if test -n "${wget}"; then
+ ${wget} -q -O $OUT2 $f
+ elif test -n "${lynx}"; then
+ ${lynx} -dump $f >$OUT2
+ else
+ break
+ fi
if diff $OUT1 $OUT2 >$DIFF; then
:
else
fi
else
echo "Test $testno: Making for the first time"
- wget -q -O $OUT1 $f
+ ${wget} -q -O $OUT1 $f
code=1
fi
testno=`expr $testno + 1`
else
sleep $f
fi
+ if ps -p $PP2PID >/dev/null 2>&1; then
+ :
+ else
+ echo "pazpar2 died"
+ fi
done
IFS="$oIFS"