From 38d07819859dd0a732ad3ca4169af20afcc7de07 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 7 Feb 2021 00:10:33 -0800 Subject: [PATCH] scons: Remove "TIMEOUT" variable and checks. This was used when regression tests were run from scons. Since that hasn't been done for a while, these checks and this setting have no purpose and can be removed. Change-Id: Ibe383944f1427571061fd25ed6e97d9acfbbc7f1 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40856 Maintainer: Gabe Black Tested-by: kokoro Reviewed-by: Andreas Sandberg --- SConstruct | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/SConstruct b/SConstruct index 6b028ee0e..3e892cdbf 100755 --- a/SConstruct +++ b/SConstruct @@ -498,20 +498,6 @@ except Exception as e: warning('While checking protoc version:', str(e)) main['HAVE_PROTOC'] = False -# 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. -if sys.platform.startswith('freebsd'): - timeout_lines = readCommand(['gtimeout', '--version'], - exception='').splitlines() -else: - 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 - def CheckCxxFlag(context, flag, autoadd=True): context.Message("Checking for compiler %s support... " % flag) last_cxxflags = context.env['CXXFLAGS'] -- 2.30.2