Skip to content

Commit c48ead5

Browse files
committed
try of correct CPU limit in bin/test-driver-ff
1 parent 44a79e2 commit c48ead5

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

bin/test-driver-ff

+3-2
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,12 @@ if [ "0$FFnp" -gt 0 ] ; then
118118
else
119119
FLAGS_FFPP_B="${FLAGS_FFPP}"
120120
fi
121-
export MPIEXEC_TIMEOUT=300
121+
export MPIEXEC_TIMEOUT=50
122122
test -z "${COMMONPROGRAMFILES+x}" -a -z "${WINDIR+x}" && ulimit -t 60
123123
${TEST_FFPP} ${FLAGS_FFPP_B} "$@" ${FLAGS_FFPP_A}>$log_file 2>&1
124124
estatus=$?
125-
FAIL_CPU_LIMIT=`tail -100 $log_file|egrep -i 'Cputime limit exceeded|MPIEXEC_TIMEOUT|Timeout after'|wc -l`
125+
echo "status " $estatus >>$log_file
126+
FAIL_CPU_LIMIT=`tail -100 $log_file|egrep -i 'Cputime limit exceeded|MPIEXEC_TIMEOUT|APPLICATION TIMED OUT|Timeout after'|wc -l`
126127
fi
127128

128129
## Add an error suffix in order to extract errored tests only

0 commit comments

Comments
 (0)