mercurial: comparison tests/run-tests.py

equal deleted inserted replaced

-:bc35b9ed3ae7
+:3868c9ab4bf8
 help="skip tests listed in the specified blacklist file")
 parser.add_option("--whitelist", action="append",
 help="always run tests listed in the specified whitelist file")
 parser.add_option("-C", "--annotate", action="store_true",
 help="output files annotated with coverage")
-parser.add_option("--child", type="int",
-help="run as child process, summary to given fd")
 parser.add_option("-c", "--cover", action="store_true",
 help="print a test coverage report")
 parser.add_option("-d", "--debug", action="store_true",
 help="debug mode: write output of test scripts to console"
 " rather than capturing and diff'ing it (disables timeout)")
 parser.error("sorry, coverage options do not work when --local "
 "is specified")
 global verbose
 if options.verbose:
-if options.jobs > 1 or options.child is not None:
+verbose = ''
-verbose = "[%d]" % os.getpid()
-else:
-verbose = ''
 if options.tmpdir:
 options.tmpdir = os.path.expanduser(options.tmpdir)
 if options.jobs < 1:
 if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
 parser.error('--py3k-warnings can only be used on Python 2.6+')
 if options.blacklist:
 options.blacklist = parselistfiles(options.blacklist, 'blacklist')
 if options.whitelist:
-options.whitelisted = parselistfiles(options.whitelist, 'whitelist',
+options.whitelisted = parselistfiles(options.whitelist, 'whitelist')
-warn=options.child is None)
 else:
 options.whitelisted = {}
 return (options, args)
 def covrun(*args):
 cmd = 'coverage %s' % ' '.join(args)
 vlog('# Running: %s' % cmd)
 os.system(cmd)
-if options.child:
-return
 covrun('-c')
 omit = ','.join(os.path.join(x, '*') for x in [BINDIR, TESTDIR])
 covrun('-i', '-r', '"--omit=%s"' % omit) # report
 if options.htmlcov:
 failed = len(results['!'])
 tested = len(results['.']) + failed
 skipped = len(results['s'])
 ignored = len(results['i'])
-if options.child:
+print
-fp = os.fdopen(options.child, 'wb')
+for s in results['s']:
-pickle.dump(results, fp, pickle.HIGHEST_PROTOCOL)
+print "Skipped %s: %s" % s
-if options.time:
+for s in results['!']:
-pickle.dump(times, fp, pickle.HIGHEST_PROTOCOL)
+print "Failed %s: %s" % s
-fp.close()
+_checkhglib("Tested")
-else:
+print "# Ran %d tests, %d skipped, %d failed." % (
-print
+tested, skipped + ignored, failed)
-for s in results['s']:
+if options.time:
-print "Skipped %s: %s" % s
+outputtimes(options)
-for s in results['!']:
-print "Failed %s: %s" % s
-_checkhglib("Tested")
-print "# Ran %d tests, %d skipped, %d failed." % (
-tested, skipped + ignored, failed)
-if options.time:
-outputtimes(options)
 if options.anycoverage:
 outputcoverage(options)
 except KeyboardInterrupt:
 failed = True
-if not options.child:
+print "\ninterrupted!"
-print "\ninterrupted!"
 if failed:
 sys.exit(1)
 testtypes = [('.py', pytest, '.out'),
 ('.t', tsttest, '')]
 def main():
 (options, args) = parseargs()
-if not options.child:
+os.umask(022)
-os.umask(022)
+checktools()
-checktools()
+if len(args) == 0:
-if len(args) == 0:
+args = [t for t in os.listdir(".")
-args = [t for t in os.listdir(".")
+if t.startswith("test-")
-if t.startswith("test-")
+and (t.endswith(".py") or t.endswith(".t"))]
-and (t.endswith(".py") or t.endswith(".t"))]
 tests = args
 if options.random:
 random.shuffle(tests)
 print 'python hash seed:', os.environ['PYTHONHASHSEED']
 global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
 TESTDIR = os.environ["TESTDIR"] = os.getcwd()
 if options.tmpdir:
-if not options.child:
+options.keep_tmpdir = True
-options.keep_tmpdir = True
 tmpdir = options.tmpdir
 if os.path.exists(tmpdir):
 # Meaning of tmpdir has changed since 1.3: we used to create
 # HGTMP inside tmpdir; now HGTMP is tmpdir.  So fail if
 # tmpdir already exists.
 PYTHONDIR = os.path.join(INST, "lib", "python")
 os.environ["BINDIR"] = BINDIR
 os.environ["PYTHON"] = PYTHON
-if not options.child:
+path = [BINDIR] + os.environ["PATH"].split(os.pathsep)
-path = [BINDIR] + os.environ["PATH"].split(os.pathsep)
+os.environ["PATH"] = os.pathsep.join(path)
-os.environ["PATH"] = os.pathsep.join(path)
+# Include TESTDIR in PYTHONPATH so that out-of-tree extensions
-# Include TESTDIR in PYTHONPATH so that out-of-tree extensions
+# can run .../tests/run-tests.py test-foo where test-foo
-# can run .../tests/run-tests.py test-foo where test-foo
+# adds an extension to HGRC
-# adds an extension to HGRC
+pypath = [PYTHONDIR, TESTDIR]
-pypath = [PYTHONDIR, TESTDIR]
+# We have to augment PYTHONPATH, rather than simply replacing
-# We have to augment PYTHONPATH, rather than simply replacing
+# it, in case external libraries are only available via current
-# it, in case external libraries are only available via current
+# PYTHONPATH.  (In particular, the Subversion bindings on OS X
-# PYTHONPATH.  (In particular, the Subversion bindings on OS X
+# are in /opt/subversion.)
-# are in /opt/subversion.)
+oldpypath = os.environ.get(IMPL_PATH)
-oldpypath = os.environ.get(IMPL_PATH)
+if oldpypath:
-if oldpypath:
+pypath.append(oldpypath)
-pypath.append(oldpypath)
+os.environ[IMPL_PATH] = os.pathsep.join(pypath)
-os.environ[IMPL_PATH] = os.pathsep.join(pypath)
 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
 vlog("# Using TESTDIR", TESTDIR)
 vlog("# Using HGTMP", HGTMP)

changeset 19279	3868c9ab4bf8
parent 19278	bc35b9ed3ae7
child 19280	eea17b7e601a