From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH] gdb/testsuite: analyze-racy-logs.py cleanup
Date: Thu, 25 Apr 2024 13:42:42 -0400 [thread overview]
Message-ID: <20240425174251.52419-1-simon.marchi@efficios.com> (raw)
- Add type annotations
- Use a raw string in one spot (where we call re.sub), to avoid an
"invalid escape sequence" warning.
- Remove unused "os" import.
Change-Id: I0149cbb73ad2b05431f032fa9d9530282cb01e90
---
gdb/testsuite/analyze-racy-logs.py | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/gdb/testsuite/analyze-racy-logs.py b/gdb/testsuite/analyze-racy-logs.py
index 152490e7686b..5a3f90ed62d0 100755
--- a/gdb/testsuite/analyze-racy-logs.py
+++ b/gdb/testsuite/analyze-racy-logs.py
@@ -29,7 +29,6 @@
# This program is invoked when the user runs "make check" and
# specifies the RACY_ITER environment variable.
-import os
import re
import sys
@@ -45,7 +44,7 @@ import sys
# }
# }
-files_and_tests = dict()
+files_and_tests: dict[str, dict[str, set[str]]] = dict()
# The relatioships between various states of the same tests that
# should be ignored. For example, if the same test PASSes on a
@@ -60,7 +59,7 @@ ignore_relations = {"PASS": "KFAIL"}
sum_matcher = re.compile("^(.?(PASS|FAIL)): (.*)$")
-def parse_sum_line(line, dic):
+def parse_sum_line(line: str, dic: dict[str, set[str]]):
"""Parse a single LINE from a sumfile, and store the results in the
dictionary referenced by DIC."""
global sum_matcher
@@ -72,7 +71,7 @@ def parse_sum_line(line, dic):
test_name = m.group(3)
# Remove tail parentheses. These are likely to be '(timeout)'
# and other extra information that will only confuse us.
- test_name = re.sub("(\s+)?\(.*$", "", test_name)
+ test_name = re.sub(r"(\s+)?\(.*$", "", test_name)
if result not in dic.keys():
dic[result] = set()
if test_name in dic[result]:
@@ -93,7 +92,7 @@ def parse_sum_line(line, dic):
dic[result].add(test_name)
-def read_sum_files(files):
+def read_sum_files(files: list[str]):
"""Read the sumfiles (passed as a list in the FILES variable), and
process each one, filling the FILES_AND_TESTS global dictionary with
information about them."""
@@ -127,8 +126,8 @@ def identify_racy_tests():
#
# Each set in ALL_TESTS will contain all tests, racy or not, for
# that state.
- nonracy_tests = dict()
- all_tests = dict()
+ nonracy_tests: dict[str, set[str]] = dict()
+ all_tests: dict[str, set[str]] = dict()
for f in files_and_tests:
for state in files_and_tests[f]:
try:
@@ -144,14 +143,14 @@ def identify_racy_tests():
# Now, we eliminate the tests that are present in states that need
# to be ignored. For example, tests both in the PASS and KFAIL
# states should not be considered racy.
- ignored_tests = set()
+ ignored_tests: set[str] = set()
for s1, s2 in ignore_relations.items():
try:
ignored_tests |= all_tests[s1] & all_tests[s2]
except:
continue
- racy_tests = set()
+ racy_tests: set[str] = set()
for f in files_and_tests:
for state in files_and_tests[f]:
racy_tests |= files_and_tests[f][state] - nonracy_tests[state]
base-commit: 5b9707eb872ad4cb50c98d396d16f110070a44ca
--
2.44.0
reply other threads:[~2024-04-25 17:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240425174251.52419-1-simon.marchi@efficios.com \
--to=simon.marchi@efficios.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).