X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_preferred.sh;h=493cdc31448f95c5b60ebbab1fd55f3e34083ec1;hb=fa99d666683b05f291265bedbabe2d73b2156ec6;hp=fe1f71b55963e9584e2be1965396b176499ba050;hpb=eaf0a318c69169024e70e067b4043f49d37de8fa;p=pazpar2-moved-to-github.git

diff --git a/test/test_preferred.sh b/test/test_preferred.sh
index fe1f71b..493cdc3 100755
--- a/test/test_preferred.sh
+++ b/test/test_preferred.sh
@@ -1,37 +1,28 @@
 #!/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
+#TODO set up solr target. For now use donut
 
-${srcdir}/run_pazpar2.sh test_preferred
+${srcdir}/run_pazpar2.sh $TEST
 E=$?
 
-grep "has preferred" pazpar2.log > test_preferred.log
-# 
-if [ -f test_preferred.res ] ; then 
+grep "has preferred" ${TEST}pazpar2.log | cut -f 4- -d ' ' > test_preferred.log
+
+if [ -f test_preferred.res ] ; then
     diff test_preferred.res test_preferred.log > test_preferred.dif
     E2=$?
-    if [ $E2 -ne 0 ] ; then 
+    if [ $E2 -ne 0 ] ; then
+	echo "has preferred test failed!"
 	E=$E2
     fi
 else
-    echo "Making test_preferred.res for first time." 
+    echo "Making test_preferred.res for first time."
     mv test_preferred.log test_preferred.res
 fi
 
-#kill `cat ztest.pid`
-#rm ztest.pid
 exit $E
 
 # Local Variables: