[Utils] Ensure that empty.txt is always empty #157576
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 this test case would `touch %S/empty.txt` to create and empty file. The test case then copies contents to that file, so if run a second time the `touch` command would not create an empty file.
|
@llvm/pr-subscribers-testing-tools Author: Henrik G. Olsson (hnrklssn) ChangesPreviously this test case would Full diff: https://github.com/llvm/llvm-project/pull/157576.diff 2 Files Affected:
diff --git a/llvm/utils/lit/tests/Inputs/diff-test-update/.gitignore b/llvm/utils/lit/tests/Inputs/diff-test-update/.gitignore
index 2211df63dd283..dd373bf9e0c66 100644
--- a/llvm/utils/lit/tests/Inputs/diff-test-update/.gitignore
+++ b/llvm/utils/lit/tests/Inputs/diff-test-update/.gitignore
@@ -1 +1,2 @@
-*.txt
+; diff-tmp-dir.test clobbers this file
+empty.txt
diff --git a/llvm/utils/lit/tests/Inputs/diff-test-update/diff-tmp-dir.test b/llvm/utils/lit/tests/Inputs/diff-test-update/diff-tmp-dir.test
index 929c2c1c6c7d3..a4fab7e74c007 100644
--- a/llvm/utils/lit/tests/Inputs/diff-test-update/diff-tmp-dir.test
+++ b/llvm/utils/lit/tests/Inputs/diff-test-update/diff-tmp-dir.test
@@ -1,5 +1,7 @@
# RUN: mkdir %t
-# RUN: touch %S/empty.txt
+# Tests that if file A is in the %t directory and file B is not,
+# the diff test updater copies from file A to B.
+# RUN: echo "" > %S/empty.txt
# RUN: cp %S/1.in %t/1.txt
# RUN: diff %t/1.txt %S/empty.txt
|
This would previously fail on Windows.
hnrklssn
added a commit
to hnrklssn/llvm-project
that referenced
this pull request
Sep 11, 2025
Previously this test case would `touch %S/empty.txt` to create and empty file. The test case then copies contents to that file, so if run a second time the `touch` command would not create an empty file. `llvm/utils/lit/tests/diff-test-update.py` also no longer matches against file paths other than the final bit of the file name. This prevents test failures on Windows due to different path separators. (cherry picked from commit 82ef4ee)
hnrklssn
added a commit
to hnrklssn/llvm-project
that referenced
this pull request
Sep 12, 2025
Previously this test case would `touch %S/empty.txt` to create and empty file. The test case then copies contents to that file, so if run a second time the `touch` command would not create an empty file. `llvm/utils/lit/tests/diff-test-update.py` also no longer matches against file paths other than the final bit of the file name. This prevents test failures on Windows due to different path separators. (cherry picked from commit 82ef4ee)
kateinoigakukun
pushed a commit
to kateinoigakukun/llvm-project
that referenced
this pull request
Sep 17, 2025
Previously this test case would `touch %S/empty.txt` to create and empty file. The test case then copies contents to that file, so if run a second time the `touch` command would not create an empty file. `llvm/utils/lit/tests/diff-test-update.py` also no longer matches against file paths other than the final bit of the file name. This prevents test failures on Windows due to different path separators. (cherry picked from commit 82ef4ee)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 this test case would
touch %S/empty.txtto create and empty file. The test case then copies contents to that file, so if run a second time thetouchcommand would not create an empty file.