[llvm] b0cb4e1 - Fix test on Windows by telling diff to ignore Windows-specific line endings. (#158297)

[via llvm-commits]

Author: dyung
Date: 2025-09-12T07:52:50-07:00
New Revision: b0cb4e17e6ee362bbd8311adf2da7f3acb625fee

URL: https://github.com/llvm/llvm-project/commit/b0cb4e17e6ee362bbd8311adf2da7f3acb625fee
DIFF: https://github.com/llvm/llvm-project/commit/b0cb4e17e6ee362bbd8311adf2da7f3acb625fee.diff

LOG: Fix test on Windows by telling diff to ignore Windows-specific line endings. (#158297)

Should fix bot: https://lab.llvm.org/buildbot/#/builders/46/builds/23206

Added: 
    

Modified: 
    llvm/utils/lit/tests/diff-test-update.py

Removed: 
    


################################################################################
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