[Python-checkins] regrtest: fix test to choose if header should be displayed (#3172)

[Victor Stinner]

https://github.com/python/cpython/commit/0fbac706f7c798fdeda63e39009c2285dad2c33f
commit: 0fbac706f7c798fdeda63e39009c2285dad2c33f
branch: 2.7
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-21T23:57:06+02:00
summary:

regrtest: fix test to choose if header should be displayed (#3172)

Check "tests" before its value is replaced.

files:
M Lib/test/regrtest.py

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index cd8cc159364..83434c88024 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -572,6 +572,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
             nottests.add(arg)
         args = []
 
+    display_header = (verbose or header or not (quiet or single or tests or args)) and (not pgo)
     alltests = findtests(testdir, stdtests, nottests)
     selected = tests or args or alltests
     if single:
@@ -657,18 +658,17 @@ def display_progress(test_index, test):
         sys.stdout.flush()
 
     # For a partial run, we do not need to clutter the output.
-    if verbose or header or not (quiet or single or tests or args):
-        if not pgo:
-            # Print basic platform information
-            print "==", platform.python_implementation(), \
-                        " ".join(sys.version.split())
-            print "==  ", platform.platform(aliased=True), \
-                          "%s-endian" % sys.byteorder
-            print "==  ", os.getcwd()
-            ncpu = cpu_count()
-            if ncpu:
-                print "== CPU count:", ncpu
-            print "Testing with flags:", sys.flags
+    if display_header:
+        # Print basic platform information
+        print "==", platform.python_implementation(), \
+                    " ".join(sys.version.split())
+        print "==  ", platform.platform(aliased=True), \
+                      "%s-endian" % sys.byteorder
+        print "==  ", os.getcwd()
+        ncpu = cpu_count()
+        if ncpu:
+            print "== CPU count:", ncpu
+        print "Testing with flags:", sys.flags
 
     if randomize:
         random.seed(random_seed)