[Utils] Compare true file locations instead of string paths #158160
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously we compared paths by string manipulation, however Windows paths can use both '\' and '/' as path separators, which made this fragile. This uses the pathlib.Path.samefile API instead.
|
@llvm/pr-subscribers-testing-tools Author: Henrik G. Olsson (hnrklssn) ChangesPreviously we compared paths by string manipulation, however Windows paths can use both '' and '/' as path separators, which made this fragile. This uses the pathlib.Path.samefile API instead. Full diff: https://github.com/llvm/llvm-project/pull/158160.diff 1 Files Affected:
diff --git a/llvm/utils/lit/lit/DiffUpdater.py b/llvm/utils/lit/lit/DiffUpdater.py
index 5bba2d70991df..fefcdcc99f3f2 100644
--- a/llvm/utils/lit/lit/DiffUpdater.py
+++ b/llvm/utils/lit/lit/DiffUpdater.py
@@ -1,6 +1,7 @@
import shutil
import os
import shlex
+import pathlib
"""
This file provides the `diff_test_updater` function, which is invoked on failed RUN lines when lit is executed with --update-tests.
@@ -76,14 +77,12 @@ def get_target_dir(commands, test_path):
@staticmethod
def create(path, commands, test_path, target_dir):
- filename = path.replace(target_dir, "")
- if filename.startswith(os.sep):
- filename = filename[len(os.sep) :]
+ path = pathlib.Path(path)
with open(test_path, "r") as f:
lines = f.readlines()
for i, l in enumerate(lines):
p = SplitFileTarget._get_split_line_path(l)
- if p == filename:
+ if p and path.samefile(os.path.join(target_dir, p)):
idx = i
break
else:
|
hnrklssn
added a commit
to hnrklssn/llvm-project
that referenced
this pull request
Sep 11, 2025
) Previously we compared paths by string manipulation, however Windows paths can use both '\' and '/' as path separators, which made this fragile. This uses the pathlib.Path.samefile API instead. (cherry picked from commit b018151)
|
Hi @hnrklssn, your fix does not seem to have fixed the Windows bot failures. Can you take a look? |
On it! Thanks for letting me know. |
|
Complete fix in #158235 |
hnrklssn
added a commit
to hnrklssn/llvm-project
that referenced
this pull request
Sep 12, 2025
) Previously we compared paths by string manipulation, however Windows paths can use both '\' and '/' as path separators, which made this fragile. This uses the pathlib.Path.samefile API instead. (cherry picked from commit b018151)
kateinoigakukun
pushed a commit
to kateinoigakukun/llvm-project
that referenced
this pull request
Sep 17, 2025
) Previously we compared paths by string manipulation, however Windows paths can use both '\' and '/' as path separators, which made this fragile. This uses the pathlib.Path.samefile API instead. (cherry picked from commit b018151)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously we compared paths by string manipulation, however Windows paths can use both '' and '/' as path separators, which made this fragile. This uses the pathlib.Path.samefile API instead.