diff options
Diffstat (limited to 'tools/test.py')
| -rwxr-xr-x | tools/test.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/test.py b/tools/test.py index d40159c6..ecc0062d 100755 --- a/tools/test.py +++ b/tools/test.py @@ -1164,6 +1164,7 @@ def ReadConfigurationInto(path, sections, defs): ARCH_GUESS = utils.GuessArchitecture() +TIMEOUT_DEFAULT = 60; def BuildOptions(): @@ -1188,7 +1189,7 @@ def BuildOptions(): result.add_option("-s", "--suite", help="A test suite", default=[], action="append") result.add_option("-t", "--timeout", help="Timeout in seconds", - default=60, type="int") + default=-1, type="int") result.add_option("--arch", help='The architecture to run tests for', default='none') result.add_option("--snapshot", help="Run the tests with snapshot turned on", @@ -1262,6 +1263,12 @@ def ProcessOptions(options): if options.arch == 'none': options.arch = ARCH_GUESS options.scons_flags.append("arch=" + options.arch) + # Simulators are slow, therefore allow a longer default timeout. + if options.timeout == -1: + if options.arch == 'arm' or options.arch == 'mips': + options.timeout = 2 * TIMEOUT_DEFAULT; + else: + options.timeout = TIMEOUT_DEFAULT; if options.snapshot: options.scons_flags.append("snapshot=on") global VARIANT_FLAGS |