Skip to content

[LIT] Fix double slash in GoogleTest format test names #22597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kekaczma wants to merge 1 commit into
base: sycl
Choose a base branch
from
+18 −8
Draft

[LIT] Fix double slash in GoogleTest format test names #22597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions llvm/utils/lit/lit/formats/googletest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
class GoogleTest(TestFormat):
def __init__(self, test_sub_dirs, test_suffix, run_under=[], test_prefix=None):
self.seen_executables = set()
self.test_sub_dirs = str(test_sub_dirs).split(";")
self.test_sub_dirs = [d for d in str(test_sub_dirs).split(";") if d] or ["."]

# On Windows, assume tests will also end in '.exe'.
exe_suffix = str(test_suffix)
Expand Down Expand Up @@ -80,12 +80,19 @@ def getTestsInDirectory(self, testSuite, path_in_suite, litConfig, localConfig):

# Create one lit test for each shard.
for idx in range(nshard):
testPath = path_in_suite + (
subdir,
fn,
str(idx),
str(nshard),
)
if subdir == ".":
testPath = path_in_suite + (
fn,
str(idx),
str(nshard),
)
else:
testPath = path_in_suite + (
subdir,
fn,
str(idx),
str(nshard),
)
json_file = (
"-".join(
[
Expand All @@ -106,7 +113,10 @@ def getTestsInDirectory(self, testSuite, path_in_suite, litConfig, localConfig):
gtest_json_file=json_file,
)
else:
testPath = path_in_suite + (subdir, fn)
if subdir == ".":
testPath = path_in_suite + (fn,)
else:
testPath = path_in_suite + (subdir, fn)
json_file = (
"-".join(
[
Expand Down
Loading