Increase valgrind time limits for tests and fix test.sh glitch

On my slow laptop some tests fail because of timeouts under
valgrind, going to 55/60 seconds should be sane.

Fixing an undiscovered bug ignoring timeout configs in test.sh.
This commit is contained in:
Christian Thaeter 2010-07-16 21:47:08 +02:00
parent 99d5d3765f
commit b578c273d5
2 changed files with 4 additions and 1 deletions

View file

@ -1 +1,4 @@
LOGSUPPRESS='^\(\*\*[0-9]*\*\* \)\?[0-9]\{10,\}[:!] \(TRACE\|INFO\|NOTICE\|WARNING\|ERR\|TODO\|PLANNED\|FIXME\|DEPRECATED\|UNIMPLEMENTED\|RESOURCE_ANNOUNCE\|RESOURCE_ENTER\|RESOURCE_STATE\|RESOURCE_LEAVE\):'
LIMIT_VG_CPU=55
LIMIT_VG_TIME=60

View file

@ -141,7 +141,7 @@ if [ "$VALGRINDFLAGS" = 'DISABLE' ]; then
echo "valgrind explicit disabled"
else
if [ "$(which valgrind)" ]; then
ulimit -S -t ${ULIMIT_VG_CPU:-20} -v ${ULIMIT_VG_VSZ:-524288}
ulimit -S -t ${LIMIT_VG_CPU:-20} -v ${LIMIT_VG_VSZ:-524288}
LIMIT_TIME_REAL="$LIMIT_VG_TIME"
if [[ -x 'vgsuppression' ]]; then
if [[ 'vgsuppression' -nt 'vgsuppression.supp' ]]; then