X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest_preferred.sh;h=3a2eb986c2f311285fb71699a3a6e52d15df4c94;hb=5f9ca65437e1cd3986adac0f54f98e4aa52393ce;hp=0d2688d814a1161374118f4fc8de6f5709023cf6;hpb=ae22e20ef787301f657c31fda47b91b44d9dc5b7;p=pazpar2-moved-to-github.git diff --git a/test/test_preferred.sh b/test/test_preferred.sh index 0d2688d..3a2eb98 100755 --- a/test/test_preferred.sh +++ b/test/test_preferred.sh @@ -1,10 +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 +#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 @@ -14,20 +15,20 @@ srcdir=${srcdir:-"."} # exit 0 #fi -${srcdir}/run_pazpar2.sh test_preferred +${srcdir}/run_pazpar2.sh $TEST E=$? -grep "has preferred" pazpar2.log | cut -f 4- -d ' ' > 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 - echo "has preferred test failed!" + 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