projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removing obsolete stuff.
[pazpar2-moved-to-github.git]
/
test
/
test_http.sh
diff --git
a/test/test_http.sh
b/test/test_http.sh
index
dafd629
..
7d052ce
100755
(executable)
--- a/
test/test_http.sh
+++ b/
test/test_http.sh
@@
-1,5
+1,5
@@
#!/bin/sh
#!/bin/sh
-# $Id: test_http.sh,v 1.4 2007-05-16 08:31:17 adam Exp $
+# $Id: test_http.sh,v 1.6 2007-05-16 13:07:18 adam Exp $
#
# Regression test using pazpar2 against z3950.indexdata.com/marc
# Reads Pazpar2 URLs from test_http_urls
#
# Regression test using pazpar2 against z3950.indexdata.com/marc
# Reads Pazpar2 URLs from test_http_urls
@@
-11,7
+11,16
@@
# srcdir might be set by make
srcdir=${srcdir:-"."}
# 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 &
PP2PID=$!
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=$!
@@
-44,7
+53,13
@@
for f in `cat ${srcdir}/test_http_urls`; do
DIFF=test_http_${testno}.dif
if test -f $OUT1; then
rm -f $OUT2
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
if diff $OUT1 $OUT2 >$DIFF; then
:
else
@@
-53,7
+68,7
@@
for f in `cat ${srcdir}/test_http_urls`; do
fi
else
echo "Test $testno: Making for the first time"
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`
code=1
fi
testno=`expr $testno + 1`