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 832228175e660b306b7f0bbe2124f84547c5a423..9f631f414f987b4f099be1c607ce16ccd2355d41 100755 (executable)
--- 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 12a8f38e77c83776d64daf5191455c438dfaf38a..bb4dcf4834263ca6f7d4af3b75e0cb00f5024a32 100644 (file)
--- 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.