run-tests: drop options.child and users

tests/run-tests.py

@@ -137,8 +137,6 b' def parseargs():'
         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",
@@ -242,9 +240,6 b' def parseargs():'
 
     global verbose
     if options.verbose:
-        if options.jobs > 1 or options.child is not None:
-            verbose = "[%d]" % os.getpid()
-        else:
             verbose = ''
 
     if options.tmpdir:
@@ -272,8 +267,7 b' def parseargs():'
     if options.blacklist:
         options.blacklist = parselistfiles(options.blacklist, 'blacklist')
     if options.whitelist:
-        options.whitelisted = parselistfiles(options.whitelist, 'whitelist',
-                                             warn=options.child is None)
+        options.whitelisted = parselistfiles(options.whitelist, 'whitelist')
     else:
         options.whitelisted = {}
 
@@ -568,9 +562,6 b' def outputcoverage(options):'
         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
@@ -1133,13 +1124,6 b' def runtests(options, tests):'
         skipped = len(results['s'])
         ignored = len(results['i'])
 
-        if options.child:
-            fp = os.fdopen(options.child, 'wb')
-            pickle.dump(results, fp, pickle.HIGHEST_PROTOCOL)
-            if options.time:
-                pickle.dump(times, fp, pickle.HIGHEST_PROTOCOL)
-            fp.close()
-        else:
             print
             for s in results['s']:
                 print "Skipped %s: %s" % s
@@ -1155,7 +1139,6 b' def runtests(options, tests):'
             outputcoverage(options)
     except KeyboardInterrupt:
         failed = True
-        if not options.child:
             print "\ninterrupted!"
 
     if failed:
@@ -1166,7 +1149,6 b" testtypes = [('.py', pytest, '.out'),"
 
 def main():
     (options, args) = parseargs()
-    if not options.child:
         os.umask(022)
 
         checktools()
@@ -1193,7 +1175,6 b' def main():'
     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
         tmpdir = options.tmpdir
         if os.path.exists(tmpdir):
@@ -1235,7 +1216,6 b' def main():'
     os.environ["BINDIR"] = BINDIR
     os.environ["PYTHON"] = PYTHON
 
-    if not options.child:
         path = [BINDIR] + os.environ["PATH"].split(os.pathsep)
         os.environ["PATH"] = os.pathsep.join(path)