projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sortmap relevance always uses increasing=1 PAZ-930
[pazpar2-moved-to-github.git]
/
test
/
test_preferred.sh
diff --git
a/test/test_preferred.sh
b/test/test_preferred.sh
index
e9899f4
..
493cdc3
100755
(executable)
--- a/
test/test_preferred.sh
+++ b/
test/test_preferred.sh
@@
-1,40
+1,28
@@
#!/bin/sh
#!/bin/sh
+TEST=`basename $0 .sh`
# 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
-#
-#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
-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!"
E=$E2
fi
else
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
mv test_preferred.log test_preferred.res
fi
-#kill `cat ztest.pid`
-#rm ztest.pid
exit $E
# Local Variables:
exit $E
# Local Variables: