From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sat, 6 Mar 2010 17:34:48 +0000 (+0000)
Subject: Merged revisions 78732 via svnmerge from
X-Git-Tag: v3.2a1~1545
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e62a1488b4ba9617d659a37443238f3c1f2b506;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 78732 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78732 | florent.xicluna | 2010-03-06 18:24:36 +0100 (sam, 06 mar 2010) | 2 lines

  Do not print the header lines when running a single test.
........
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 832228175e66..9f631f414f98 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -399,12 +399,6 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
     resource_denieds = []
     environment_changed = []
 
-    if not quiet:
-        # Print basic platform information
-        print("==", platform.python_implementation(), *sys.version.split())
-        print("==  ", platform.platform(aliased=True))
-        print("==  ", os.getcwd())
-
     if findleaks:
         try:
             import gc
@@ -449,6 +443,14 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
                 stdtests.remove(arg)
             nottests.add(arg)
         args = []
+
+    # For a partial run, we do not need to clutter the output.
+    if verbose or not (quiet or tests or args):
+        # Print basic platform information
+        print("==", platform.python_implementation(), *sys.version.split())
+        print("==  ", platform.platform(aliased=True))
+        print("==  ", os.getcwd())
+
     alltests = findtests(testdir, stdtests, nottests)
     tests = tests or args or alltests
     if single:
diff --git a/Misc/NEWS b/Misc/NEWS
index 12a8f38e77c8..bb4dcf483426 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -845,6 +845,9 @@ Documentation
 Tests
 -----
 
+- Print platform information when running the whole test suite, or using
+  the --verbose flag.
+
 - Issue #767675: enable test_pep277 on POSIX platforms with Unicode-friendly
   filesystem encoding.