From 2780e8283c5d16b3943b7cabc886fda0dd029e6c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 11 Nov 2014 10:00:06 +0100
Subject: Do not import pygments prematurely when running with coverage.

---
 tests/run.py | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/tests/run.py b/tests/run.py
index 94d629e8..c54e0bfa 100644
--- a/tests/run.py
+++ b/tests/run.py
@@ -28,18 +28,23 @@ except ImportError:
     print('nose is required to run the Pygments test suite')
     sys.exit(1)
 
-try:
-    # make sure the current source is first on sys.path
-    sys.path.insert(0, '..')
-    import pygments
-except SyntaxError as err:
-    print('Syntax error: %s' % err)
-    sys.exit(1)
-except ImportError as err:
-    print('Cannot find Pygments to test: %s' % err)
-    sys.exit(1)
+# make sure the current source is first on sys.path
+sys.path.insert(0, '..')
+
+if '--with-coverage' not in sys.argv:
+    # if running with coverage, pygments should not be imported before coverage
+    # is started, otherwise it will count already executed lines as uncovered
+    try:
+        import pygments
+    except ImportError as err:
+        print('Cannot find Pygments to test: %s' % err)
+        sys.exit(1)
+    else:
+        print('Pygments %s test suite running (Python %s)...' %
+              (pygments.__version__, sys.version.split()[0]),
+              file=sys.stderr)
 else:
-    print('Pygments %s test suite running (Python %s)...' %
-          (pygments.__version__, sys.version.split()[0]))
+    print('Pygments test suite running (Python %s)...' % sys.version.split()[0],
+          file=sys.stderr)
 
 nose.main()
-- 
cgit v1.2.1