X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_http.sh;h=5d177c702fa8500333684808407d9d8789301e53;hb=64dccf5757a22cedd3c21ca834e3e02f39dd0504;hp=42fdd4914031ee6d1a2c69dcecadae3cd0958e55;hpb=9ed0f85d50987f6aff5629a4cc7aac685101f748;p=pazpar2-moved-to-github.git

diff --git a/test/test_http.sh b/test/test_http.sh
index 42fdd49..5d177c7 100755
--- a/test/test_http.sh
+++ b/test/test_http.sh
@@ -1,103 +1,11 @@
 #!/bin/sh
-# $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
-#            Outputs to test_http_<no>.log
-#            Matches against results in test_http_<no>.res
-#
-
 
+TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-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
-
-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 3
-
-# Set to success by default.. Will be set to non-zero in case of failure
-code=0
-
-if ps -p $PP2PID >/dev/null 2>&1; then
-    :
-else
-    code=1
-    PP2PID=""
-    echo "pazpar2 failed to start"
-fi
-
-# We can start test for real
-
-oIFS="$IFS"
-IFS='
-'
-
-testno=1
-for f in `cat ${srcdir}/test_http_urls`; do
-    if echo $f | grep '^http' >/dev/null; then
-	OUT1=${srcdir}/test_http_${testno}.res
-	OUT2=test_http_${testno}.log
-	DIFF=test_http_${testno}.dif
-	if test -f $OUT1; then
-	    rm -f $OUT2
-	    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
-		echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
-		code=1
-	    fi
-	else
-	    echo "Test $testno: Making for the first time"
-	    ${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"
-
-sleep 1
-# Kill programs
-
-if test -n "$PP2PID"; then
-    kill $PP2PID
-fi
-
-exit $code
+exec ${srcdir}/run_pazpar2.sh $TEST
 
 # Local Variables:
 # mode:shell-script