Mercurial > public > mercurial-scm > hg

comparison tests/run-tests.py @ 19303:ef29a552d00d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: remove spurious disable of --time with --debug
author Matt Mackall <mpm@selenic.com>
date Fri, 07 Jun 2013 15:58:14 -0500
parents a1b8b1b9e2e2
children 59d5281b5799
comparison
equal deleted inserted replaced
19302:a1b8b1b9e2e2 19303:ef29a552d00d
254 if options.debug: 254 if options.debug:
255 if options.timeout != defaults['timeout']: 255 if options.timeout != defaults['timeout']:
256 sys.stderr.write( 256 sys.stderr.write(
257 'warning: --timeout option ignored with --debug\n') 257 'warning: --timeout option ignored with --debug\n')
258 options.timeout = 0 258 options.timeout = 0
259 if options.time:
260 sys.stderr.write(
261 'warning: --time option ignored with --debug\n')
262 options.time = False
263 if options.py3k_warnings: 259 if options.py3k_warnings:
264 if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0): 260 if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
265 parser.error('--py3k-warnings can only be used on Python 2.6+') 261 parser.error('--py3k-warnings can only be used on Python 2.6+')
266 if options.blacklist: 262 if options.blacklist:
267 options.blacklist = parselistfiles(options.blacklist, 'blacklist') 263 options.blacklist = parselistfiles(options.blacklist, 'blacklist')