Clean up test scripts

yaz-ztest daemon handling and ICU check is now handled in
run_pazpar2.sh.

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 091c802..b24f59b 100755 (executable)
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -23,7 +23,31 @@ kill_pazpar2()
     fi
 }
 
-PREFIX=$1
+ztest=false
+icu=false
+while test $# -gt 0; do
+    case "$1" in
+        -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+        *) optarg= ;;
+    esac
+    case $1 in
+        --ztest)
+            ztest=true
+            ;;
+        --icu)
+            icu=true
+            ;;
+        -*)
+           echo "Bad option $1"
+           exit 1
+            ;;
+       *)
+           PREFIX=$1
+           ;;
+    esac
+    shift
+done
+
 if test "x${PREFIX}" = "x"; then
     echo Missing prefix for run_pazpar2.sh
     exit 1
@@ -45,11 +69,48 @@ if test -z $curl; then
     echo "curl not found. $PREFIX can not be tested"
     exit 1
 fi
+
+if test "$ztest" = "true" ; then
+    oIFS=$IFS
+    IFS=:
+    F=''
+    for p in $PATH; do
+       if test -x $p/yaz-ztest -a -x $p/yaz-client; then
+           VERSION=`$p/yaz-client -V|awk '{print $3;}'|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+            if test $VERSION -ge 4002052; then
+               F=$p/yaz-ztest
+               break
+            fi
+       fi
+    done
+    IFS=$oIFS
+    if test -z "$F"; then
+       echo "yaz-ztest not found"
+       exit 0
+    fi
+    rm -f ztest.pid
+    rm -f ${PREFIX}_ztest.log
+    $F -l ${PREFIX}_ztest.log -p ztest.pid -D tcp:localhost:9999
+    sleep 1
+    if test ! -f ztest.pid; then
+       echo "yaz-ztest could not be started"
+       exit 0
+    fi
+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
+if test "$icu" = "true"; then
+    if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
+       :
+    else
+       SKIP_PAZPAR2=true
+    fi
+fi
+
 # remove log if starting pazpar2
+if [ -z "$SKIP_PAZPAR2" ] ; then
     rm -f ${PREFIX}_pazpar2.log
 fi
 
@@ -85,6 +146,10 @@ if [ -z "$SKIP_PAZPAR2" -a -z "$WAIT_PAZPAR2" ] ; then
        trap kill_pazpar2 HUP
     else
        echo "pazpar2 failed to start"
+       if test -f ztest.pid; then
+           kill `cat ztest.pid`
+           rm ztest.pid
+       fi
        exit 1
     fi
 fi
@@ -174,14 +239,16 @@ if [ "$WAIT_PAZPAR2" ] ; then
     done
     echo "done"
 fi
-
 # Kill programs
+if test -f ztest.pid; then
+    kill `cat ztest.pid`
+    rm ztest.pid
+fi
 
 if [ -z "$SKIP_PAZPAR2" ] ; then
     kill_pazpar2
     sleep 2
 fi
-
 exit $code
 
 # Local Variables:

diff --git a/test/test_facets.sh b/test/test_facets.sh
index 6f22f01..e64b961 100755 (executable)
--- a/test/test_facets.sh
+++ b/test/test_facets.sh
@@ -4,45 +4,7 @@ TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-# look for yaz-ztest in PATH
-oIFS=$IFS
-IFS=:
-F=''
-for p in $PATH; do
-    if test -x $p/yaz-ztest -a -x $p/yaz-client; then
-       VERSION=`$p/yaz-client -V|awk '{print $3;}'|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-       if test $VERSION -ge 4002042; then
-           F=$p/yaz-ztest
-            break
-       fi
-    fi
-done
-IFS=$oIFS
-
-if test -z "$F"; then
-   echo "yaz-ztest not found that supports facets"
-   exit 0
-fi
-
-rm -f ztest.pid
-$F -l ztest.log -p ztest.pid -D tcp:localhost:9999
-sleep 1
-if test ! -f ztest.pid; then
-    echo "yaz-ztest could not be started"
-    exit 0
-fi
-
-E=0
-if test -x ../src/pazpar2; then
-    if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
-       ${srcdir}/run_pazpar2.sh $TEST
-       E=$?
-    fi
-fi
-
-kill `cat ztest.pid`
-rm ztest.pid
-exit $E
+exec ${srcdir}/run_pazpar2.sh --ztest --icu $TEST
 
 # Local Variables:
 # mode:shell-script

diff --git a/test/test_filter.sh b/test/test_filter.sh
index ff745df..e64b961 100755 (executable)
--- a/test/test_filter.sh
+++ b/test/test_filter.sh
@@ -1,51 +1,10 @@
 #!/bin/sh
-#
 
+TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-TEST=`basename $0 .sh`
-
-# look for yaz-ztest in PATH
-oIFS=$IFS
-IFS=:
-F=''
-for p in $PATH; do
-    if test -x $p/yaz-ztest -a -x $p/yaz-client; then
-       VERSION=`$p/yaz-client -V|awk '{print $3;}'|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-        if test $VERSION -ge 4000000; then
-            F=$p/yaz-ztest
-            break
-        fi
-    fi
-done
-IFS=$oIFS
-
-if test -z "$F"; then
-    echo "yaz-ztest not found"
-    exit 0
-fi
-
-rm -f ztest.pid
-rm -f ${TEST}_ztest.log
-$F -l ${TEST}_ztest.log -p ztest.pid -D tcp:localhost:9999
-sleep 1
-if test ! -f ztest.pid; then
-    echo "yaz-ztest could not be started"
-    exit 0
-fi
-
-E=0
-if test -x ../src/pazpar2; then
-    if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
-       ${srcdir}/run_pazpar2.sh $TEST
-       E=$?
-    fi
-fi
-
-kill `cat ztest.pid`
-rm ztest.pid
-exit $E
+exec ${srcdir}/run_pazpar2.sh --ztest --icu $TEST
 
 # Local Variables:
 # mode:shell-script

diff --git a/test/test_icu.sh b/test/test_icu.sh
index 46bb6b9..3ff2e8b 100755 (executable)
--- a/test/test_icu.sh
+++ b/test/test_icu.sh
@@ -1,16 +1,11 @@
 #!/bin/sh
-#
 
 TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-if test -x ../src/pazpar2; then
-    if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
-       exec ${srcdir}/run_pazpar2.sh $TEST
-    fi
-fi
-exit 0
+exec ${srcdir}/run_pazpar2.sh --icu $TEST
+
 # Local Variables:
 # mode:shell-script
 # sh-indentation: 2

diff --git a/test/test_limit_limitmap.sh b/test/test_limit_limitmap.sh
index beb294d..3ff2e8b 100755 (executable)
--- a/test/test_limit_limitmap.sh
+++ b/test/test_limit_limitmap.sh
@@ -1,15 +1,10 @@
 #!/bin/sh
-#
 
 TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-if test -x ../src/pazpar2; then
-    if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
-       exec ${srcdir}/run_pazpar2.sh $TEST
-    fi
-fi
+exec ${srcdir}/run_pazpar2.sh --icu $TEST
 
 # Local Variables:
 # mode:shell-script

diff --git a/test/test_preferred.sh b/test/test_preferred.sh
index 3a2eb98..493cdc3 100755 (executable)
--- a/test/test_preferred.sh
+++ b/test/test_preferred.sh
@@ -5,15 +5,6 @@ TEST=`basename $0 .sh`
 srcdir=${srcdir:-"."}
 
 #TODO set up solr target. For now use donut
-#F=../solr/client.sh
-#
-#rm -f solr.pid
-#$F -l solr.log -p ztest.pid -D @:9999
-#sleep 1
-#if test ! -f ztest.pid; then
-#    echo "yaz-ztest could not be started"
-#    exit 0
-#fi
 
 ${srcdir}/run_pazpar2.sh $TEST
 E=$?
@@ -32,8 +23,6 @@ else
     mv test_preferred.log test_preferred.res
 fi
 
-#kill `cat ztest.pid`
-#rm ztest.pid
 exit $E
 
 # Local Variables:

diff --git a/test/test_solr.sh b/test/test_solr.sh
index b6c74e2..8b08bb3 100755 (executable)
--- a/test/test_solr.sh
+++ b/test/test_solr.sh
@@ -1,29 +1,11 @@
 #!/bin/sh
+#
 
+TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-TEST=`basename $0 .sh`
-
-#TODO set up solr target. For now use donut 
-#F=../solr/client.sh 
-#
-#rm -f solr.pid
-#$F -l solr.log -p ztest.pid -D @:9999
-#sleep 1
-#if test ! -f ztest.pid; then
-#    echo "yaz-ztest could not be started"
-#    exit 0
-#fi
-
-E=0
-if test -x ../src/pazpar2; then
-    if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
-       ${srcdir}/run_pazpar2.sh $TEST
-       E=$?
-    fi
-fi
-exit $E
+exec ${srcdir}/run_pazpar2.sh --icu $TEST
 
 # Local Variables:
 # mode:shell-script

diff --git a/test/test_solr_spell.sh b/test/test_solr_spell.sh
index 6f2961f..5d177c7 100755 (executable)
--- a/test/test_solr_spell.sh
+++ b/test/test_solr_spell.sh
@@ -1,25 +1,11 @@
 #!/bin/sh
+#
 
+TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-#TODO set up solr target. For now use donut 
-#F=../solr/client.sh 
-#
-#rm -f solr.pid
-#$F -l solr.log -p ztest.pid -D @:9999
-#sleep 1
-#if test ! -f ztest.pid; then
-#    echo "yaz-ztest could not be started"
-#    exit 0
-#fi
-
-${srcdir}/run_pazpar2.sh test_solr_spell
-E=$?
-
-#kill `cat ztest.pid`
-#rm ztest.pid
-exit $E
+exec ${srcdir}/run_pazpar2.sh $TEST
 
 # Local Variables:
 # mode:shell-script

diff --git a/test/test_sort.sh b/test/test_sort.sh
index 2ed0501..3ff2e8b 100755 (executable)
--- a/test/test_sort.sh
+++ b/test/test_sort.sh
@@ -1,22 +1,10 @@
 #!/bin/sh
 
+TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-TEST=`basename $0 .sh`
-
-# Using test solr target opencontent-solr
-E=0
-if test -x ../src/pazpar2; then
-    if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
-       ${srcdir}/run_pazpar2.sh $TEST
-       E=$?
-    fi
-fi
-
-#kill `cat ztest.pid`
-#rm ztest.pid
-exit $E
+exec ${srcdir}/run_pazpar2.sh --icu $TEST
 
 # Local Variables:
 # mode:shell-script

diff --git a/test/test_sru.sh b/test/test_sru.sh
index ff745df..3b31704 100755 (executable)
--- a/test/test_sru.sh
+++ b/test/test_sru.sh
@@ -1,51 +1,10 @@
 #!/bin/sh
-#
 
+TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-TEST=`basename $0 .sh`
-
-# look for yaz-ztest in PATH
-oIFS=$IFS
-IFS=:
-F=''
-for p in $PATH; do
-    if test -x $p/yaz-ztest -a -x $p/yaz-client; then
-       VERSION=`$p/yaz-client -V|awk '{print $3;}'|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-        if test $VERSION -ge 4000000; then
-            F=$p/yaz-ztest
-            break
-        fi
-    fi
-done
-IFS=$oIFS
-
-if test -z "$F"; then
-    echo "yaz-ztest not found"
-    exit 0
-fi
-
-rm -f ztest.pid
-rm -f ${TEST}_ztest.log
-$F -l ${TEST}_ztest.log -p ztest.pid -D tcp:localhost:9999
-sleep 1
-if test ! -f ztest.pid; then
-    echo "yaz-ztest could not be started"
-    exit 0
-fi
-
-E=0
-if test -x ../src/pazpar2; then
-    if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
-       ${srcdir}/run_pazpar2.sh $TEST
-       E=$?
-    fi
-fi
-
-kill `cat ztest.pid`
-rm ztest.pid
-exit $E
+exec ${srcdir}/run_pazpar2.sh --icu --ztest $TEST
 
 # Local Variables:
 # mode:shell-script

diff --git a/test/test_termlist_block.sh b/test/test_termlist_block.sh
index dbe89d9..e64b961 100755 (executable)
--- a/test/test_termlist_block.sh
+++ b/test/test_termlist_block.sh
@@ -1,51 +1,10 @@
 #!/bin/sh
-#
 
+TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-TEST=`basename $0 .sh`
-
-# look for yaz-ztest in PATH
-oIFS=$IFS
-IFS=:
-F=''
-for p in $PATH; do
-    if test -x $p/yaz-ztest -a -x $p/yaz-client; then
-       VERSION=`$p/yaz-client -V|awk '{print $3;}'|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-        if test $VERSION -ge 4002052; then
-            F=$p/yaz-ztest
-            break
-        fi
-    fi
-done
-IFS=$oIFS
-
-if test -z "$F"; then
-    echo "yaz-ztest not found"
-    exit 0
-fi
-
-rm -f ztest.pid
-rm -f ${TEST}_ztest.log
-$F -l ${TEST}_ztest.log -p ztest.pid -D tcp:localhost:9999
-sleep 1
-if test ! -f ztest.pid; then
-    echo "yaz-ztest could not be started"
-    exit 0
-fi
-
-E=0
-if test -x ../src/pazpar2; then
-    if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
-       ${srcdir}/run_pazpar2.sh $TEST
-       E=$?
-    fi
-fi
-
-kill `cat ztest.pid`
-rm ztest.pid
-exit $E
+exec ${srcdir}/run_pazpar2.sh --ztest --icu $TEST
 
 # Local Variables:
 # mode:shell-script

diff --git a/test/test_url.sh b/test/test_url.sh
index beb294d..3ff2e8b 100755 (executable)
--- a/test/test_url.sh
+++ b/test/test_url.sh
@@ -1,15 +1,10 @@
 #!/bin/sh
-#
 
 TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-if test -x ../src/pazpar2; then
-    if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
-       exec ${srcdir}/run_pazpar2.sh $TEST
-    fi
-fi
+exec ${srcdir}/run_pazpar2.sh --icu $TEST
 
 # Local Variables:
 # mode:shell-script