Fix test on Windows by telling diff to ignore Windows-specific line endings. #158297
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
|
@llvm/pr-subscribers-testing-tools Author: None (dyung) Changes#157765 added some additional tests for split-file and attempted to diff the output files to make sure they matched what was expected. The problem was that on Windows the files being created had Windows line endings '\r\n' which was causing the diff to fail because the comparison files were presumably created on unix and did not have the '\r' character in the line endings. This fixes it by passing Should fix bot: https://lab.llvm.org/buildbot/#/builders/46/builds/23206 Full diff: https://github.com/llvm/llvm-project/pull/158297.diff 1 Files Affected:
diff --git a/llvm/utils/lit/tests/diff-test-update.py b/llvm/utils/lit/tests/diff-test-update.py
index ad14034a85a17..8b9f4610f7f95 100644
--- a/llvm/utils/lit/tests/diff-test-update.py
+++ b/llvm/utils/lit/tests/diff-test-update.py
@@ -8,13 +8,13 @@
# RUN: not %{lit} --update-tests -v %S/Inputs/diff-test-update | FileCheck %s
-# RUN: diff %S/Inputs/diff-test-update/single-split-file.out %S/Inputs/diff-test-update/single-split-file.test
-# RUN: diff %S/Inputs/diff-test-update/single-split-file.out %S/Inputs/diff-test-update/single-split-file-populated.test
-# RUN: diff %S/Inputs/diff-test-update/multiple-split-file.out %S/Inputs/diff-test-update/multiple-split-file.test
-# RUN: diff %S/Inputs/diff-test-update/multiple-split-file.out %S/Inputs/diff-test-update/multiple-split-file-populated.test
-# RUN: diff %S/Inputs/diff-test-update/single-split-file-no-expected.out %S/Inputs/diff-test-update/single-split-file-no-expected.test
-# RUN: diff %S/Inputs/diff-test-update/split-c-comments.out %S/Inputs/diff-test-update/split-c-comments.test
-# RUN: diff %S/Inputs/diff-test-update/split-whitespace.out "%S/Inputs/diff-test-update/split whitespace.test"
+# RUN: diff --strip-trailing-cr %S/Inputs/diff-test-update/single-split-file.out %S/Inputs/diff-test-update/single-split-file.test
+# RUN: diff --strip-trailing-cr %S/Inputs/diff-test-update/single-split-file.out %S/Inputs/diff-test-update/single-split-file-populated.test
+# RUN: diff --strip-trailing-cr %S/Inputs/diff-test-update/multiple-split-file.out %S/Inputs/diff-test-update/multiple-split-file.test
+# RUN: diff --strip-trailing-cr %S/Inputs/diff-test-update/multiple-split-file.out %S/Inputs/diff-test-update/multiple-split-file-populated.test
+# RUN: diff --strip-trailing-cr %S/Inputs/diff-test-update/single-split-file-no-expected.out %S/Inputs/diff-test-update/single-split-file-no-expected.test
+# RUN: diff --strip-trailing-cr %S/Inputs/diff-test-update/split-c-comments.out %S/Inputs/diff-test-update/split-c-comments.test
+# RUN: diff --strip-trailing-cr %S/Inputs/diff-test-update/split-whitespace.out "%S/Inputs/diff-test-update/split whitespace.test"
# CHECK: # update-diff-test: could not deduce source and target from {{.*}}1.in and {{.*}}2.in
|
|
The precommit failure is also present in at least one build bot, so is unrelated to this change: https://lab.llvm.org/buildbot/#/builders/195/builds/14511 |
hnrklssn
pushed a commit
to hnrklssn/llvm-project
that referenced
this pull request
Sep 12, 2025
…ndings. (llvm#158297) Should fix bot: https://lab.llvm.org/buildbot/#/builders/46/builds/23206 (cherry picked from commit b0cb4e1)
hnrklssn
pushed a commit
to hnrklssn/llvm-project
that referenced
this pull request
Sep 12, 2025
…ndings. (llvm#158297) Should fix bot: https://lab.llvm.org/buildbot/#/builders/46/builds/23206 (cherry picked from commit b0cb4e1)
kateinoigakukun
pushed a commit
to kateinoigakukun/llvm-project
that referenced
this pull request
Sep 17, 2025
…ndings. (llvm#158297) Should fix bot: https://lab.llvm.org/buildbot/#/builders/46/builds/23206 (cherry picked from commit b0cb4e1)
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.
#157765 added some additional tests for split-file and attempted to diff the output files to make sure they matched what was expected. The problem was that on Windows the files being created had Windows line endings '\r\n' which was causing the diff to fail because the comparison files were presumably created on unix and did not have the '\r' character in the line endings.
This fixes it by passing
--strip-trailing-crto diff to tell it to ignore that character when doing the diff.Should fix bot: https://lab.llvm.org/buildbot/#/builders/46/builds/23206