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
Command info includes versions, statistics
[pazpar2-moved-to-github.git]
/
test
/
run_pazpar2.sh
diff --git
a/test/run_pazpar2.sh
b/test/run_pazpar2.sh
index
1f4a94d
..
226e5d4
100755
(executable)
--- a/
test/run_pazpar2.sh
+++ b/
test/run_pazpar2.sh
@@
-59,6
+59,17
@@
if test "x${PREFIX}" = "x"; then
exit 1
fi
exit 1
fi
+URLS=${PREFIX}.urls
+if test ! -f ${srcdir}/${URLS}; then
+ echo "${srcdir}/${URLS} missing"
+ exit 1
+fi
+CFG=${PREFIX}.cfg
+if test ! -f ${srcdir}/${CFG}; then
+ echo "${srcdir}/${CFG} missing"
+ exit 1
+fi
+
# look for curl in PATH
oIFS=$IFS
IFS=:
# look for curl in PATH
oIFS=$IFS
IFS=:
@@
-136,8
+147,6
@@
if [ -z "$SKIP_PAZPAR2" ] ; then
rm -f ${PREFIX}_pazpar2.log
fi
rm -f ${PREFIX}_pazpar2.log
fi
-CFG=${PREFIX}.cfg
-URLS=${PREFIX}.urls
VALGRINDLOG=${PREFIX}_valgrind.log
if test `uname` = "Linux"; then
VALGRINDLOG=${PREFIX}_valgrind.log
if test `uname` = "Linux"; then
@@
-147,7
+156,7
@@
else
sec=1
maxrounds=10
fi
sec=1
maxrounds=10
fi
-LEVELS=loglevel,fatal,warn,log,debug,zoom,zoomdetails
+LEVELS=loglevel,fatal,warn,log,debug,zoom,zoomdetails,http,iochan
if test "$PERF_PROG"; then
eval $PERF_PROG ../src/pazpar2 -p pazpar2.pid -X -l ${PREFIX}_pazpar2.log -f ${srcdir}/${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
PP2PID=$!
if test "$PERF_PROG"; then
eval $PERF_PROG ../src/pazpar2 -p pazpar2.pid -X -l ${PREFIX}_pazpar2.log -f ${srcdir}/${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
PP2PID=$!
@@
-159,7
+168,7
@@
if test "$PERF_PROG"; then
elif test -n "$PAZPAR2_USE_VALGRIND"; then
valgrind --num-callers=30 --show-reachable=yes --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -v $LEVELS -X -l ${PREFIX}_pazpar2.log -f ${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
PP2PID=$!
elif test -n "$PAZPAR2_USE_VALGRIND"; then
valgrind --num-callers=30 --show-reachable=yes --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -v $LEVELS -X -l ${PREFIX}_pazpar2.log -f ${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
PP2PID=$!
- sleep 0.01
+ sleep 10
WAIT=400
elif test -n "$SKIP_PAZPAR2"; then
echo "${PREFIX}: not starting Pazpar2 (should be running already)"
WAIT=400
elif test -n "$SKIP_PAZPAR2"; then
echo "${PREFIX}: not starting Pazpar2 (should be running already)"