projects
/
pazpar2-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
42dacbb
)
Fix problem with first-time test and testno=1
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 3 Jul 2014 10:40:36 +0000
(12:40 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 3 Jul 2014 10:40:36 +0000
(12:40 +0200)
test/run_pazpar2.sh
patch
|
blob
|
history
diff --git
a/test/run_pazpar2.sh
b/test/run_pazpar2.sh
index
ec9932d
..
c95775f
100755
(executable)
--- a/
test/run_pazpar2.sh
+++ b/
test/run_pazpar2.sh
@@
-145,7
+145,7
@@
else
sec=1
maxrounds=10
fi
sec=1
maxrounds=10
fi
-LEVELS=loglevel,fatal,warn,log,debug,notime,zoom,zoomdetails
+LEVELS=loglevel,fatal,warn,log,debug,zoom,zoomdetails
if 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=$!
if 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=$!
@@
-216,10
+216,11
@@
for f in `cat ${srcdir}/${URLS}`; do
fi
fi
else
fi
fi
else
- if test $rounds -eq 0; then
+ if test $testno -eq 1 -o $rounds -eq 0; then
echo "${PREFIX} $testno: Making for the first time"
mv $OUT2 $OUT1
code=1
echo "${PREFIX} $testno: Making for the first time"
mv $OUT2 $OUT1
code=1
+ rounds=0
fi
fi
if test $rounds -gt 0; then
fi
fi
if test $rounds -gt 0; then