Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line

tests/run-tests.py

@@ -40,6 +40,7 b' def find_program(program):'
             return name
     return None
 
+def check_required_tools():
 # Before we go any further, check for pre-requisite tools
 # stuff from coreutils (cat, rm, etc) are not tested
 for p in required_tools:
@@ -51,28 +52,12 b' for p in required_tools:'
     else:
         print "WARNING: Did not find prerequisite tool: "+p
 
-# Reset some environment variables to well-known values
-os.environ['LANG'] = os.environ['LC_ALL'] = 'C'
-os.environ['TZ'] = 'GMT'
-
-os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
-os.environ["HGMERGE"]  = sys.executable + ' -c "import sys; sys.exit(0)"'
-os.environ["HGUSER"]   = "test"
-os.environ["HGRCPATH"] = ""
-
-TESTDIR = os.environ["TESTDIR"] = os.getcwd()
-HGTMP   = os.environ["HGTMP"]   = tempfile.mkdtemp("", "hgtests.")
-
 def cleanup_exit():
     if verbose:
         print "# Cleaning up HGTMP", HGTMP
     shutil.rmtree(HGTMP, True)
 
-vlog("# Using TESTDIR", TESTDIR)
-vlog("# Using HGTMP", HGTMP)
-
-os.umask(022)
-
+def install_hg():
 vlog("# Performing temporary installation of HG")
 INST = os.path.join(HGTMP, "install")
 BINDIR = os.path.join(INST, "bin")
@@ -91,16 +76,12 b' else:'
     for line in f:
         print line,
     f.close()
-    cleanup_exit()
     sys.exit(1)
 os.chdir(TESTDIR)
 
 os.environ["PATH"] = "%s%s%s" % (BINDIR, os.pathsep, os.environ["PATH"])
 os.environ["PYTHONPATH"] = PYTHONDIR
 
-tests = 0
-failed = 0
-
 def run(cmd, split_lines=True):
     """Run command in a sub-process, capturing the output (stdout and stderr).
     Return the exist code, and output."""
@@ -176,7 +157,35 b' def run_one(test):'
     shutil.rmtree(tmpd, True)
     return ret == 0
 
-for test in os.listdir("."):
+
+os.umask(022)
+
+check_required_tools()
+
+# Reset some environment variables to well-known values so that
+# the tests produce repeatable output.
+os.environ['LANG'] = os.environ['LC_ALL'] = 'C'
+os.environ['TZ'] = 'GMT'
+
+os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
+os.environ["HGMERGE"]  = sys.executable + ' -c "import sys; sys.exit(0)"'
+os.environ["HGUSER"]   = "test"
+os.environ["HGRCPATH"] = ""
+
+TESTDIR = os.environ["TESTDIR"] = os.getcwd()
+HGTMP   = os.environ["HGTMP"]   = tempfile.mkdtemp("", "hgtests.")
+vlog("# Using TESTDIR", TESTDIR)
+vlog("# Using HGTMP", HGTMP)
+
+try:
+    install_hg()
+
+    tests = 0
+    failed = 0
+
+    if len(args) == 0:
+        args = os.listdir(".")
+    for test in args:
     if test.startswith("test-"):
         if '~' in test or re.search(r'\.(out|err)$', test):
             continue
@@ -184,8 +193,8 b' for test in os.listdir("."):'
             failed += 1
         tests += 1
 
-print "# Ran %d tests, %d failed." % (tests, failed)
-
+    print "\n# Ran %d tests, %d failed." % (tests, failed)
+finally:
 cleanup_exit()
 
 if failed: