Mercurial > hg > pyhgsh

changeset 2145:5bb3cb9e5d13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make indentation of coverage code in run-tests.py nicer.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 27 Apr 2006 22:01:28 -0700
parents d3bddedfdbd0
children eb1ed410aa34
files tests/run-tests.py
diffstat 1 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests.py	Thu Apr 27 21:59:44 2006 -0700
+++ b/tests/run-tests.py	Thu Apr 27 22:01:28 2006 -0700
@@ -103,27 +103,26 @@
         os.chmod(os.path.join(BINDIR, 'hg'), 0700)
 
 def output_coverage():
-    if coverage:
-        vlog("# Producing coverage report")
-        omit = [BINDIR, TESTDIR, PYTHONDIR]
-        if not options.cover_stdlib:
-            # Exclude as system paths (ignoring empty strings seen on win)
-            omit += [x for x in sys.path if x != '']  
-        omit = ','.join(omit)
-        os.chdir(PYTHONDIR)
-        cmd = '"%s" "%s" -r "--omit=%s"' % (
-            sys.executable, os.path.join(TESTDIR, 'coverage.py'), omit)
+    vlog("# Producing coverage report")
+    omit = [BINDIR, TESTDIR, PYTHONDIR]
+    if not options.cover_stdlib:
+        # Exclude as system paths (ignoring empty strings seen on win)
+        omit += [x for x in sys.path if x != '']  
+    omit = ','.join(omit)
+    os.chdir(PYTHONDIR)
+    cmd = '"%s" "%s" -r "--omit=%s"' % (
+        sys.executable, os.path.join(TESTDIR, 'coverage.py'), omit)
+    vlog("# Running: "+cmd)
+    os.system(cmd)
+    if options.annotate:
+        adir = os.path.join(TESTDIR, 'annotated')
+        if not os.path.isdir(adir):
+            os.mkdir(adir)
+        cmd = '"%s" "%s" -a "--directory=%s" "--omit=%s"' % (
+            sys.executable, os.path.join(TESTDIR, 'coverage.py'),
+            adir, omit)
         vlog("# Running: "+cmd)
         os.system(cmd)
-        if options.annotate:
-            adir = os.path.join(TESTDIR, 'annotated')
-            if not os.path.isdir(adir):
-                os.mkdir(adir)
-            cmd = '"%s" "%s" -a "--directory=%s" "--omit=%s"' % (
-                sys.executable, os.path.join(TESTDIR, 'coverage.py'),
-                adir, omit)
-            vlog("# Running: "+cmd)
-            os.system(cmd)
 
 def run(cmd, split_lines=True):
     """Run command in a sub-process, capturing the output (stdout and stderr).
@@ -242,7 +241,8 @@
             tests += 1
 
     print "\n# Ran %d tests, %d failed." % (tests, failed)
-    output_coverage()
+    if coverage:
+        output_coverage()
 finally:
     cleanup_exit()