diff options
| -rwxr-xr-x | SConstruct | 13 | ||||
| -rw-r--r-- | tests/SConscript | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 6a163f762..c51c7b28c 100755 --- a/SConstruct +++ b/SConstruct @@ -784,10 +784,15 @@ if main['GCC'] and compareVersions(gcc_version, '4.9') >= 0 and \ swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS') main.Append(SWIGFLAGS=swig_flags) -# Check for 'timeout' from GNU coreutils. If present, regressions -# will be run with a time limit. -TIMEOUT_version = readCommand(['timeout', '--version'], exception=False) -main['TIMEOUT'] = TIMEOUT_version and TIMEOUT_version.find('timeout') == 0 +# Check for 'timeout' from GNU coreutils. If present, regressions will +# be run with a time limit. We require version 8.13 since we rely on +# support for the '--foreground' option. +timeout_lines = readCommand(['timeout', '--version'], + exception='').splitlines() +# Get the first line and tokenize it +timeout_version = timeout_lines[0].split() if timeout_lines else [] +main['TIMEOUT'] = timeout_version and \ + compareVersions(timeout_version[-1], '8.13') >= 0 # filter out all existing swig scanners, they mess up the dependency # stuff for some reason diff --git a/tests/SConscript b/tests/SConscript index a4b259681..3822de234 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -107,7 +107,7 @@ def run_test(target, source, env): # The slowest regression (bzip2) requires ~2.8 hours; # 4 hours was chosen to be conservative. elif env['TIMEOUT']: - cmd = 'timeout 4h %s' % cmd + cmd = 'timeout --foreground 4h %s' % cmd # Create a default value for the status string, changed as needed # based on the status. |