X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=a0bc9a0eb11682607f963c9102e64b075d39cac7;hb=refs%2Fheads%2Fbranch-1.4.4;hp=cdc6ee434424232d8d34ab09640dcceb4a747eba;hpb=dcd54047e0fbfb3b5ca295699b7132ab2606abf5;p=pazpar2-moved-to-github.git

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index cdc6ee4..a0bc9a0 100755
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -23,28 +23,31 @@ IFS=$oIFS
 
 if test -z $curl; then
     echo "curl not found. $PREFIX can not be tested"
-    exit 0
+    exit 1
 fi
 GET='$curl --silent --output $OUT2 "$f"'
 POST='$curl --silent --header "Content-Type: text/xml" --data-binary "@$postfile" --output $OUT2  "$f"'
 
+if [ -z "$SKIP_PAZPAR2" ] ; then
 # Fire up pazpar2
-rm -f pazpar2.log
-
+    rm -f pazpar2.log
+fi
 PREFIX=$1
 if test "x${PREFIX}" = "x"; then
     echo Missing prefix for run_pazpar2.sh
     exit 1
 fi
+
 CFG=${PREFIX}.cfg
 URLS=${PREFIX}_urls
 VALGRINDLOG=${PREFIX}_valgrind.log
 
-usevalgrind=false
-if $usevalgrind; then
+if test -n "$PAZPAR2_USE_VALGRIND"; then
     valgrind --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -X -l pazpar2.log -f ${CFG} >extra_pazpar2.log 2>&1 &
+elif test -n "$SKIP_PAZPAR2"; then 
+    echo "Skipping pazpar2. Must already be running with correct config!!! " 
 else
-    YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -d -X -l pazpar2.log -f ${srcdir}/${CFG} >extra_pazpar2.log 2>&1 &
+    YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -v all -d -X -l pazpar2.log -f ${srcdir}/${CFG} >extra_pazpar2.log 2>&1 &
 fi
 
 
@@ -56,20 +59,18 @@ 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"
+if [ -z "$SKIP_PAZPAR2" ] ; then 
+    if ps -p $PP2PID >/dev/null 2>&1; then
+	:
+    else
+	code=1
+	PP2PID=""
+	echo "pazpar2 failed to start"
+    fi
 fi
 
 # We can start test for real
 
-oIFS="$IFS"
-IFS='
-'
-
 testno=1
 for f in `cat ${srcdir}/${URLS}`; do
     if echo $f | grep '^http' >/dev/null; then
@@ -77,6 +78,9 @@ for f in `cat ${srcdir}/${URLS}`; do
 	OUT2=${PREFIX}_${testno}.log
 	DIFF=${PREFIX}_${testno}.dif
 	rm -f $OUT2 $DIFF
+	if [ -n "$DEBUG" ] ; then 
+	    echo "test $testno: $f" 
+	fi
 	if test -n "${postfile}"; then
 	    eval $POST
 	else
@@ -101,30 +105,36 @@ for f in `cat ${srcdir}/${URLS}`; do
 	testno=`expr $testno + 1`
 	postfile=
     elif echo $f | grep '^[0-9]' >/dev/null; then
+	if [ -n "$DEBUG" ] ; then 
+	    echo "Sleeping $f"
+	fi
 	sleep $f
     else
-	if test -f $f; then
-	    postfile=$f
+	if test -f $srcdir/$f; then
+	    postfile=$srcdir/$f
 	else
 	    echo "File $f does not exist"
 	    code=1
 	fi
     fi
-    if ps -p $PP2PID >/dev/null 2>&1; then
-	:
-    else
-	IFS="$oIFS"
-	echo "Test $testno: pazpar2 died"
-	exit 1
+    if [ -z "$SKIP_PAZPAR2" ] ; then  
+	if ps -p $PP2PID >/dev/null 2>&1; then
+	    :
+	else
+	    IFS="$oIFS"
+	    echo "Test $testno: pazpar2 died"
+	    exit 1
+	fi
     fi
 done
-IFS="$oIFS"
 
 # Kill programs
 
-if test -n "$PP2PID"; then
-    kill $PP2PID
-    sleep 2
+if [ -z "$SKIP_PAZPAR2" ] ; then 
+    if test -n "$PP2PID"; then
+	kill $PP2PID
+	sleep 2
+    fi
 fi
 
 exit $code