And clean up the testing scripts as well.
13 files changed:
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
-${srcdir}/run_pazpar2.sh test_facets
-E=$?
+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
kill `cat ztest.pid`
rm ztest.pid
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
# look for yaz-ztest in PATH
oIFS=$IFS
# look for yaz-ztest in PATH
oIFS=$IFS
-rm -f ${TEST}ztest.log
-$F -l ${TEST}ztest.log -p ztest.pid -D tcp:localhost:9999
+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
sleep 1
if test ! -f ztest.pid; then
echo "yaz-ztest could not be started"
exit 0
fi
-# Test using test_http.cfg
-${srcdir}/run_pazpar2.sh test_filter
-E=$?
+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
kill `cat ztest.pid`
rm ztest.pid
exit $E
-FILE=`basename $0`
-TEST=${FILE/.sh/}
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
-# Test using test_http.cfg
exec ${srcdir}/run_pazpar2.sh $TEST
# Local Variables:
exec ${srcdir}/run_pazpar2.sh $TEST
# Local Variables:
# srcdir might be set by make
srcdir=${srcdir:-"."}
if test -x ../src/pazpar2; then
if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
# 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_icu
+ exec ${srcdir}/run_pazpar2.sh $TEST
-FILE=`basename $0`
-TEST=${FILE/.sh/}
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
-# Test using test_http.cfg
-exec ${srcdir}/run_pazpar2.sh $TEST
+if test -x ../src/pazpar2; then
+ if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
+ exec ${srcdir}/run_pazpar2.sh $TEST
+ fi
+fi
# Local Variables:
# mode:shell-script
# Local Variables:
# mode:shell-script
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
-# Test using test_http.cfg
-exec ${srcdir}/run_pazpar2.sh test_post
+exec ${srcdir}/run_pazpar2.sh $TEST
# Local Variables:
# mode:shell-script
# Local Variables:
# mode:shell-script
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
-#TODO set up solr target. For now use donut
-#F=../solr/client.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
#
#rm -f solr.pid
#$F -l solr.log -p ztest.pid -D @:9999
-TEST=test_preferred_
-
-${srcdir}/run_pazpar2.sh test_preferred
+${srcdir}/run_pazpar2.sh $TEST
E=$?
grep "has preferred" ${TEST}pazpar2.log | cut -f 4- -d ' ' > test_preferred.log
E=$?
grep "has preferred" ${TEST}pazpar2.log | cut -f 4- -d ' ' > test_preferred.log
-#
-if [ -f test_preferred.res ] ; then
+
+if [ -f test_preferred.res ] ; then
diff test_preferred.res test_preferred.log > test_preferred.dif
E2=$?
diff test_preferred.res test_preferred.log > test_preferred.dif
E2=$?
- if [ $E2 -ne 0 ] ; then
- echo "has preferred test failed!"
+ if [ $E2 -ne 0 ] ; then
+ echo "has preferred test failed!"
- echo "Making test_preferred.res for first time."
+ echo "Making test_preferred.res for first time."
mv test_preferred.log test_preferred.res
fi
mv test_preferred.log test_preferred.res
fi
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
-# Test using test_http.cfg
-exec ${srcdir}/run_pazpar2.sh test_settings
+exec ${srcdir}/run_pazpar2.sh $TEST
# Local Variables:
# mode:shell-script
# Local Variables:
# mode:shell-script
# srcdir might be set by make
srcdir=${srcdir:-"."}
# 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
#
#TODO set up solr target. For now use donut
#F=../solr/client.sh
#
-${srcdir}/run_pazpar2.sh test_solr
-E=$?
-
-#kill `cat ztest.pid`
-#rm ztest.pid
+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
# Local Variables:
exit $E
# Local Variables:
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
+TEST=`basename $0 .sh`
+
# Using test solr target opencontent-solr
# Using test solr target opencontent-solr
-#
-${srcdir}/run_pazpar2.sh test_sort
-E=$?
+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
#kill `cat ztest.pid`
#rm ztest.pid
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
-TEST=test_termlist_block
# look for yaz-ztest in PATH
oIFS=$IFS
# look for yaz-ztest in PATH
oIFS=$IFS
-# Test using test_http.cfg
-${srcdir}/run_pazpar2.sh ${TEST}
-E=$?
+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
kill `cat ztest.pid`
rm ztest.pid
exit $E
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
-# Test using test_http.cfg
-exec ${srcdir}/run_pazpar2.sh test_turbomarcxml
+exec ${srcdir}/run_pazpar2.sh $TEST
# Local Variables:
# mode:shell-script
# Local Variables:
# mode:shell-script
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
-# Test using test_http.cfg
-exec ${srcdir}/run_pazpar2.sh test_url
+if test -x ../src/pazpar2; then
+ if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
+ exec ${srcdir}/run_pazpar2.sh $TEST
+ fi
+fi
# Local Variables:
# mode:shell-script
# Local Variables:
# mode:shell-script