Skip to content

Commit 52b9863

Browse files
committed
Fix timeout check on Linux
1 parent 069e84e commit 52b9863

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

bin/test-driver-ff

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# test-driver-ff from test-driver - basic testsuite driver script.
33
# modif F. Hecht UPMC.
44

5-
scriptversion=2013-06-27.18; # UTC
5+
scriptversion=2025-02-21.16; # UTC
66

77
# Copyright (C) 2011-2013 Free Software Foundation, Inc.
88
#
@@ -125,10 +125,12 @@ estatus=$?
125125
echo "status " $estatus >>$log_file
126126
FAIL_CPU_LIMIT=`tail -100 $log_file|egrep -i 'Cputime limit exceeded|MPIEXEC_TIMEOUT|APPLICATION TIMED OUT|Timeout after'|wc -l`
127127
fi
128-
128+
# Catch ulimit timeout on Linux
129+
if [ $estatus -eq 137 ]; then
130+
FAIL_CPU_LIMIT=2
131+
fi
129132
## Add an error suffix in order to extract errored tests only
130-
if [ $estatus -ne 0 ] && [ $estatus -ne 77 ]
131-
then
133+
if [ $estatus -ne 0 ] && [ $estatus -ne 77 ]; then
132134
cp $log_file "${log_file}.err"
133135
fi
134136

0 commit comments

Comments
 (0)