From 0befe536d9dbcef8e1f7850dc57e8fd5b024b3e0 Mon Sep 17 00:00:00 2001 From: Tex Riddell Date: Wed, 28 May 2025 15:50:29 -0700 Subject: [PATCH 1/2] Fix python literal string errors in TestRunner.py --- utils/lit/lit/TestRunner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py index d5c3370aea..59f2f94cb2 100644 --- a/utils/lit/lit/TestRunner.py +++ b/utils/lit/lit/TestRunner.py @@ -441,7 +441,7 @@ def parseIntegratedTestScript(test, normalize_slashes=False, re_cond_end = re.compile('%{') re_if = re.compile('(.*?)(?:%if)') re_nested_if = re.compile('(.*?)(?:%if|%})') - re_else = re.compile('^\s*%else\s*(%{)?') + re_else = re.compile(r'^\s*%else\s*(%{)?') # Collect the test lines from the script. @@ -455,13 +455,13 @@ def parseIntegratedTestScript(test, normalize_slashes=False, ln = ln.rstrip() # Substitute line number expressions - ln = re.sub('%\(line\)', str(line_number), ln) + ln = re.sub(r'%\(line\)', str(line_number), ln) def replace_line_number(match): if match.group(1) == '+': return str(line_number + int(match.group(2))) if match.group(1) == '-': return str(line_number - int(match.group(2))) - ln = re.sub('%\(line *([\+-]) *(\d+)\)', replace_line_number, ln) + ln = re.sub(r'%\(line *([\+-]) *(\d+)\)', replace_line_number, ln) # Collapse lines with trailing '\\'. if script and script[-1][-1] == '\\': From 5ea5349856fbcc7c10220497b95e5c1ac81dcd68 Mon Sep 17 00:00:00 2001 From: Tex Riddell Date: Tue, 3 Jun 2025 17:48:47 -0700 Subject: [PATCH 2/2] change existing formatting to satisfy darker --- utils/lit/lit/TestRunner.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py index 59f2f94cb2..578c9cea5e 100644 --- a/utils/lit/lit/TestRunner.py +++ b/utils/lit/lit/TestRunner.py @@ -438,10 +438,10 @@ def parseIntegratedTestScript(test, normalize_slashes=False, ]) # re for %if - re_cond_end = re.compile('%{') - re_if = re.compile('(.*?)(?:%if)') - re_nested_if = re.compile('(.*?)(?:%if|%})') - re_else = re.compile(r'^\s*%else\s*(%{)?') + re_cond_end = re.compile("%{") + re_if = re.compile("(.*?)(?:%if)") + re_nested_if = re.compile("(.*?)(?:%if|%})") + re_else = re.compile(r"^\s*%else\s*(%{)?") # Collect the test lines from the script. @@ -455,13 +455,15 @@ def parseIntegratedTestScript(test, normalize_slashes=False, ln = ln.rstrip() # Substitute line number expressions - ln = re.sub(r'%\(line\)', str(line_number), ln) + ln = re.sub(r"%\(line\)", str(line_number), ln) + def replace_line_number(match): if match.group(1) == '+': return str(line_number + int(match.group(2))) if match.group(1) == '-': return str(line_number - int(match.group(2))) - ln = re.sub(r'%\(line *([\+-]) *(\d+)\)', replace_line_number, ln) + + ln = re.sub(r"%\(line *([\+-]) *(\d+)\)", replace_line_number, ln) # Collapse lines with trailing '\\'. if script and script[-1][-1] == '\\':