[gdb/testsuite] updated analyze-racy-logs.py to python3

Message ID 20211001182417.28960-1-blarsen@redhat.com
State Superseded
Headers show
Series
  • [gdb/testsuite] updated analyze-racy-logs.py to python3
Related show

Commit Message

Lancelot SIX via Gdb-patches Oct. 1, 2021, 6:24 p.m.
Since python 2 is no longer supported on most distributions, updated the
script to run under python while while still being runnable under
python2.
---
 gdb/testsuite/analyze-racy-logs.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

-- 
2.27.0

Comments

Lancelot SIX via Gdb-patches Oct. 1, 2021, 6:38 p.m. | #1
On Fri, Oct 01, 2021 at 03:24:17PM -0300, Bruno Larsen via Gdb-patches wrote:
> Since python 2 is no longer supported on most distributions, updated the

> script to run under python while while still being runnable under

> python2.

> ---

>  gdb/testsuite/analyze-racy-logs.py | 13 +++++++------

>  1 file changed, 7 insertions(+), 6 deletions(-)

> 

> diff --git a/gdb/testsuite/analyze-racy-logs.py b/gdb/testsuite/analyze-racy-logs.py

> index 604a272831c..c2cd8169d91 100755

> --- a/gdb/testsuite/analyze-racy-logs.py

> +++ b/gdb/testsuite/analyze-racy-logs.py

> @@ -145,7 +145,8 @@ def identify_racy_tests():

>      # to be ignored.  For example, tests both in the PASS and KFAIL

>      # states should not be considered racy.

>      ignored_tests = set()

> -    for s1, s2 in ignore_relations.iteritems():

> +    for s1 in ignore_relations:

> +        s2 = ignore_relations[s1]


Hi,

In python3 you can use .items() to replace what used to be .iteritems()
in python2:

    for s1, s2 in ignore_relations.items():

It does not change much, but it simplifies your patch.

Best,
Lancelot.


>          try:

>              ignored_tests |= all_tests[s1] & all_tests[s2]

>          except:

> @@ -159,16 +160,16 @@ def identify_racy_tests():

>      racy_tests = racy_tests - ignored_tests

>  

>      # Print the header.

> -    print "\t\t=== gdb racy tests ===\n"

> +    print("\t\t=== gdb racy tests ===\n")

>  

>      # Print each test.

>      for line in sorted(racy_tests):

> -        print line

> +        print(line)

>  

>      # Print the summary.

> -    print "\n"

> -    print "\t\t=== gdb Summary ===\n"

> -    print "# of racy tests:\t\t%d" % len(racy_tests)

> +    print("\n")

> +    print("\t\t=== gdb Summary ===\n")

> +    print("# of racy tests:\t\t%d" % len(racy_tests))

>  

>  

>  if __name__ == "__main__":

> -- 

> 2.27.0

>

Patch

diff --git a/gdb/testsuite/analyze-racy-logs.py b/gdb/testsuite/analyze-racy-logs.py
index 604a272831c..c2cd8169d91 100755
--- a/gdb/testsuite/analyze-racy-logs.py
+++ b/gdb/testsuite/analyze-racy-logs.py
@@ -145,7 +145,8 @@  def identify_racy_tests():
     # to be ignored.  For example, tests both in the PASS and KFAIL
     # states should not be considered racy.
     ignored_tests = set()
-    for s1, s2 in ignore_relations.iteritems():
+    for s1 in ignore_relations:
+        s2 = ignore_relations[s1]
         try:
             ignored_tests |= all_tests[s1] & all_tests[s2]
         except:
@@ -159,16 +160,16 @@  def identify_racy_tests():
     racy_tests = racy_tests - ignored_tests
 
     # Print the header.
-    print "\t\t=== gdb racy tests ===\n"
+    print("\t\t=== gdb racy tests ===\n")
 
     # Print each test.
     for line in sorted(racy_tests):
-        print line
+        print(line)
 
     # Print the summary.
-    print "\n"
-    print "\t\t=== gdb Summary ===\n"
-    print "# of racy tests:\t\t%d" % len(racy_tests)
+    print("\n")
+    print("\t\t=== gdb Summary ===\n")
+    print("# of racy tests:\t\t%d" % len(racy_tests))
 
 
 if __name__ == "__main__":