Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(895)

Side by Side Diff: tools/run-tests.py

Issue 23475036: Revert "Increase test timeout on slow architectures." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # 2 #
3 # Copyright 2012 the V8 project authors. All rights reserved. 3 # Copyright 2012 the V8 project authors. All rights reserved.
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 shell_dir = os.path.join(workspace, options.outdir, 286 shell_dir = os.path.join(workspace, options.outdir,
287 "%s.%s" % (arch, mode)) 287 "%s.%s" % (arch, mode))
288 shell_dir = os.path.relpath(shell_dir) 288 shell_dir = os.path.relpath(shell_dir)
289 289
290 # Populate context object. 290 # Populate context object.
291 mode_flags = MODE_FLAGS[mode] 291 mode_flags = MODE_FLAGS[mode]
292 timeout = options.timeout 292 timeout = options.timeout
293 if timeout == -1: 293 if timeout == -1:
294 # Simulators are slow, therefore allow a longer default timeout. 294 # Simulators are slow, therefore allow a longer default timeout.
295 if arch in SLOW_ARCHS: 295 if arch in SLOW_ARCHS:
296 timeout = 3 * TIMEOUT_DEFAULT; 296 timeout = 2 * TIMEOUT_DEFAULT;
297 else: 297 else:
298 timeout = TIMEOUT_DEFAULT; 298 timeout = TIMEOUT_DEFAULT;
299 299
300 timeout *= TIMEOUT_SCALEFACTOR[mode] 300 timeout *= TIMEOUT_SCALEFACTOR[mode]
301 ctx = context.Context(arch, mode, shell_dir, 301 ctx = context.Context(arch, mode, shell_dir,
302 mode_flags, options.verbose, 302 mode_flags, options.verbose,
303 timeout, options.isolates, 303 timeout, options.isolates,
304 options.command_prefix, 304 options.command_prefix,
305 options.extra_flags) 305 options.extra_flags)
306 306
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 except KeyboardInterrupt: 383 except KeyboardInterrupt:
384 return 1 384 return 1
385 385
386 if options.time: 386 if options.time:
387 verbose.PrintTestDurations(suites, overall_duration) 387 verbose.PrintTestDurations(suites, overall_duration)
388 return exit_code 388 return exit_code
389 389
390 390
391 if __name__ == "__main__": 391 if __name__ == "__main__":
392 sys.exit(Main()) 392 sys.exit(Main())
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698