Fire test against z3950.indexdata.com/marc instead.

[pazpar2-moved-to-github.git] / test / test_http.sh

diff --git a/test/test_http.sh b/test/test_http.sh
index 2c62d4b..dafd629 100755 (executable)
--- a/test/test_http.sh
+++ b/test/test_http.sh
@@ -1,39 +1,22 @@
 #!/bin/sh
-# $Id: test_http.sh,v 1.3 2007-05-15 21:40:57 adam Exp $
+# $Id: test_http.sh,v 1.4 2007-05-16 08:31:17 adam Exp $
 #
-# Regression test using pazpar2 against yaz-ztest
+# 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_htttp_<no>.res
+#            Matches against results in test_http_<no>.res
 #
 
 
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-# Find a suitable yaz-ztest
-yt=""
-for d in /usr/bin /usr/local/bin ${srcdir}/../../yaz/ztest ${srcdir}/../../../yaz/ztest; do
-    yt=${d}/yaz-ztest
-    if test -x ${yt}; then
-       break
-    fi
-done
-if test ! -x "${yt}"; then
-    echo "No yaz-ztest found. Skipping"
-    exit 0
-fi
-
-# Fire up yaz-ztest (should match port in test_http.xml)
-$yt -l test_http_ztest.log tcp:@:9764 &
-YTPID=$!
-
 # Fire yp 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 &
 PP2PID=$!
 
-# Give both programs room to start properly..
+# Give it a chance to start properly..
 sleep 1
 
 # Set to success by default.. Will be set to non-zero in case of failure
@@ -47,42 +30,41 @@ else
     echo "pazpar2 failed to start"
 fi
 
-if ps -p $YTPID >/dev/null 2>&1; then
-    :
-else
-    code=1
-    YTPID=""
-    echo "yaz-ztest failed to start"
-fi
 # We can start test for real
 
+oIFS="$IFS"
+IFS='
+'
+
 testno=1
 for f in `cat ${srcdir}/test_http_urls`; do
-    OUT1=${srcdir}/test_http_${testno}.res
-    OUT2=test_http_${testno}.log
-    DIFF=test_http_${testno}.dif
-    if test -f $OUT1; then
-       rm -f $OUT2
-       wget -q -O $OUT2 $f
-       if diff $OUT1 $OUT2 >$DIFF; then
-           :
+    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
+           wget -q -O $OUT2 $f
+           if diff $OUT1 $OUT2 >$DIFF; then
+               :
+           else
+               echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
+               code=1
+           fi
        else
-           echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
+           echo "Test $testno: Making for the first time"
+           wget -q -O $OUT1 $f
            code=1
        fi
+       testno=`expr $testno + 1`
     else
-       echo "Test $testno: Making for the first time"
-       wget -q -O $OUT1 $f
-       code=1
+       sleep $f
     fi
-    testno=`expr $testno + 1`
 done
+IFS="$oIFS"
 
 sleep 1
 # Kill programs
-if test -n "$YTPID"; then
-    kill $YTPID
-fi
 
 if test -n "$PP2PID"; then
     kill $PP2PID