run-tests: factor out main(); reduce use of globals a bit.

tests/run-tests.py

@@ -183,7 +183,7 b' def check_required_tools():'
         else:
             print "WARNING: Did not find prerequisite tool: "+p
 
-def cleanup_exit():
+def cleanup_exit(options):
     if not options.keep_tmpdir:
         if verbose:
             print "# Cleaning up HGTMP", HGTMP
@@ -206,7 +206,7 b' def use_correct_python():'
         shutil.copyfile(sys.executable, my_python)
         shutil.copymode(sys.executable, my_python)
 
-def install_hg():
+def install_hg(options):
     global python
     vlog("# Performing temporary installation of HG")
     installerrs = os.path.join("tests", "install.err")
@@ -281,7 +281,7 b' def _hgpath():'
     hgpath.close()
     return path
 
-def output_coverage():
+def output_coverage(options):
     vlog("# Producing coverage report")
     omit = [BINDIR, TESTDIR, PYTHONDIR]
     if not options.cover_stdlib:
@@ -339,7 +339,7 b' def run(cmd):'
                        % options.timeout)
     return ret, splitnewlines(output)
 
-def run_one(test, skips, fails):
+def run_one(options, test, skips, fails):
     '''tristate output:
     None -> skipped
     True -> passed
@@ -496,7 +496,7 b' def run_one(test, skips, fails):'
         return None
     return ret == 0
 
-def run_children(tests):
+def run_children(options, expecthg, tests):
     if not options.with_hg:
         install_hg()
         if hgpkg != expecthg:
@@ -561,14 +561,14 b' def run_children(tests):'
         tested, skipped, failed)
     sys.exit(failures != 0)
 
-def run_tests(tests):
+def run_tests(options, expecthg, tests):
     global DAEMON_PIDS, HGRCPATH
     DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
     HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
 
     try:
         if not options.with_hg:
-            install_hg()
+            install_hg(options)
 
             if hgpkg != expecthg:
                 print '# Testing unexpected mercurial: %s' % hgpkg
@@ -602,7 +602,7 b' def run_tests(tests):'
             if options.retest and not os.path.exists(test + ".err"):
                 skipped += 1
                 continue
-            ret = run_one(test, skips, fails)
+            ret = run_one(options, test, skips, fails)
             if ret is None:
                 skipped += 1
             elif not ret:
@@ -639,7 +639,7 b' def run_tests(tests):'
                 tested, skipped, failed)
 
         if coverage:
-            output_coverage()
+            output_coverage(options)
     except KeyboardInterrupt:
         failed = True
         print "\ninterrupted!"
@@ -647,6 +647,7 b' def run_tests(tests):'
     if failed:
         sys.exit(1)
 
+def main():
 (options, args) = parse_args()
 if not options.child:
     os.umask(022)
@@ -660,6 +661,7 b" os.environ['TZ'] = 'GMT'"
 os.environ["EMAIL"] = "Foo Bar <[e-mail]>"
 os.environ['CDPATH'] = ''
 
+    global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
 TESTDIR = os.environ["TESTDIR"] = os.getcwd()
 HGTMP = os.environ['HGTMP'] = os.path.realpath(tempfile.mkdtemp('', 'hgtests.',
                                                options.tmpdir))
@@ -702,8 +704,10 b' vlog("# Using HGTMP", HGTMP)'
 
 try:
     if len(tests) > 1 and options.jobs > 1:
-        run_children(tests)
+            run_children(options, expecthg, tests)
     else:
-        run_tests(tests)
+            run_tests(options, expecthg, tests)
 finally:
-    cleanup_exit()
+        cleanup_exit(options)
+
+main()