[llvm] r362846 - Fix string literals to avoid deprecation warnings in regexp patterns
Adrian McCarthy via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 7 14:14:34 PDT 2019
Author: amccarth
Date: Fri Jun 7 14:14:33 2019
New Revision: 362846
URL: http://llvm.org/viewvc/llvm-project?rev=362846&view=rev
Log:
Fix string literals to avoid deprecation warnings in regexp patterns
In LLDB, where tests run with the debug version of Python, we get a
series of deprecation warnings because escape sequences like `\(` are
being treated as part of the string literal rather than an escape for
the regexp pattern.
NFC intended.
Differential Revision: https://reviews.llvm.org/D62882
Modified:
llvm/trunk/utils/lit/lit/TestRunner.py
Modified: llvm/trunk/utils/lit/lit/TestRunner.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/TestRunner.py?rev=362846&r1=362845&r2=362846&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/TestRunner.py (original)
+++ llvm/trunk/utils/lit/lit/TestRunner.py Fri Jun 7 14:14:33 2019
@@ -49,7 +49,7 @@ kDevNull = "/dev/null"
# This regex captures ARG. ARG must not contain a right parenthesis, which
# terminates %dbg. ARG must not contain quotes, in which ARG might be enclosed
# during expansion.
-kPdbgRegex = '%dbg\(([^)\'"]*)\)'
+kPdbgRegex = '%dbg\\(([^)\'"]*)\\)'
class ShellEnvironment(object):
@@ -1420,14 +1420,14 @@ class IntegratedTestKeywordParser(object
# Trim trailing whitespace.
line = line.rstrip()
# Substitute line number expressions
- line = re.sub('%\(line\)', str(line_number), line)
+ line = re.sub(r'%\(line\)', str(line_number), line)
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)))
- line = re.sub('%\(line *([\+-]) *(\d+)\)', replace_line_number, line)
+ line = re.sub(r'%\(line *([\+-]) *(\d+)\)', replace_line_number, line)
# Collapse lines with trailing '\\'.
if output and output[-1][-1] == '\\':
output[-1] = output[-1][:-1] + line
More information about the llvm-commits
mailing list