shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cross-project-tests] Fix invalid escape sequences (#94031)

Browse Source 
These generate a SyntaxWarning with Python 3.12.
This commit is contained in:
Eisuke Kawashima 2025-01-13 21:15:22 +09:00 committed by GitHub
parent 5eb9acff28
commit a1a3e019d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cross-project-tests/debuginfo-tests/dexter/dex/command/ParseCommand.py
View File

@ -128,7 +128,7 @@ def _build_command(
def _search_line_for_cmd_start(line: str, start: int, valid_commands: dict) -> int: def _search_line_for_cmd_start(line: str, start: int, valid_commands: dict) -> int:
"""Scan `line` for a string matching any key in `valid_commands`. r"""Scan `line` for a string matching any key in `valid_commands`.
Start searching from `start`. Start searching from `start`.
Commands escaped with `\` (E.g. `\DexLabel('a')`) are ignored. Commands escaped with `\` (E.g. `\DexLabel('a')`) are ignored.
@ -543,7 +543,7 @@ class TestParseCommand(unittest.TestCase):
def test_parse_escaped(self): def test_parse_escaped(self):
"""Escaped commands are ignored.""" """Escaped commands are ignored."""
lines = ['words \MockCmd("IGNORED") words words words\n'] lines = ['words \\MockCmd("IGNORED") words words words\n']
values = self._find_all_mock_values_in_lines(lines) values = self._find_all_mock_values_in_lines(lines)

6
cross-project-tests/lit.cfg.py
View File

@ -223,7 +223,7 @@ if platform.system() == "Darwin":
xcode_lldb_vers = subprocess.check_output(["xcrun", "lldb", "--version"]).decode( xcode_lldb_vers = subprocess.check_output(["xcrun", "lldb", "--version"]).decode(
"utf-8" "utf-8"
) )
match = re.search("lldb-(\d+)", xcode_lldb_vers) match = re.search(r"lldb-(\d+)", xcode_lldb_vers)
if match: if match:
apple_lldb_vers = int(match.group(1)) apple_lldb_vers = int(match.group(1))
if apple_lldb_vers < 1000: if apple_lldb_vers < 1000:
@ -247,7 +247,7 @@ def get_gdb_version_string():
if len(gdb_vers_lines) < 1: if len(gdb_vers_lines) < 1:
print("Unkown GDB version format (too few lines)", file=sys.stderr) print("Unkown GDB version format (too few lines)", file=sys.stderr)
return None return None
match = re.search("GNU gdb \(.*?\) ((\d|\.)+)", gdb_vers_lines[0].strip()) match = re.search(r"GNU gdb \(.*?\) ((\d|\.)+)", gdb_vers_lines[0].strip())
if match is None: if match is None:
print(f"Unkown GDB version format: {gdb_vers_lines[0]}", file=sys.stderr) print(f"Unkown GDB version format: {gdb_vers_lines[0]}", file=sys.stderr)
return None return None
@ -261,7 +261,7 @@ def get_clang_default_dwarf_version_string(triple):
# Get the flags passed by the driver and look for -dwarf-version. # Get the flags passed by the driver and look for -dwarf-version.
cmd = f'{llvm_config.use_llvm_tool("clang")} -g -xc -c - -v -### --target={triple}' cmd = f'{llvm_config.use_llvm_tool("clang")} -g -xc -c - -v -### --target={triple}'
stderr = subprocess.run(cmd.split(), stderr=subprocess.PIPE).stderr.decode() stderr = subprocess.run(cmd.split(), stderr=subprocess.PIPE).stderr.decode()
match = re.search("-dwarf-version=(\d+)", stderr) match = re.search(r"-dwarf-version=(\d+)", stderr)
if match is None: if match is None:
print("Cannot determine default dwarf version", file=sys.stderr) print("Cannot determine default dwarf version", file=sys.stderr)
return None return None