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

2 files changed, 12 insertions, 7 deletions

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index b7fc875774..0f5820865c 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -374,13 +374,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(), \
-                    " ".join(sys.version.split())
-        print "==  ", platform.platform(aliased=True)
-        print "==  ", os.getcwd()
-
     if findleaks:
         try:
             import gc
@@ -425,6 +418,15 @@ 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(), \
+                    " ".join(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 e6662e8b12..a60e6fd136 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -126,6 +126,9 @@ Extension Modules
 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.