Skip to content

Commit 9583672

Browse files
committed
[gitattributes] Mark some llvm-rc inputs as requiring LF newlines
These text files get embedded verbatim in llvm/test/tools/llvm-rc/tag-html.test, so their newlines form needs to match the expected form exactly. This reverts commit 2fdf49d, as that change no longer should be necessary. (At the time, buildbots had checkouts with all files having CRLF, and those don't get updated even if the toplevel .gitattributes were reverted in e669bbb. Now those buildbots have gotten fresh checkouts with all files having the right line endings.)
1 parent 9b88792 commit 9583672

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

llvm/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ test/tools/llvm-mca/X86/directives-handle-crlf.s text eol=crlf
2525

2626
# These files must have LF line endings because the test requires exact matching
2727
test/Object/Inputs/*.tbd eol=lf
28+
test/tools/llvm-rc/Inputs/webpage*.html text eol=lf
2829
test/tools/llvm-strings/radix.test text eol=lf
2930
test/tools/llvm-tapi-diff/Inputs/*.tbd text eol=lf
3031
test/tools/split-file/basic.test text eol=lf

llvm/test/tools/llvm-rc/tag-html.test

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
; RUN: rm -rf %t && mkdir %t && cd %t
2-
; Remove `\r` in case Git on Windows decided to checkout with Windows newlines.
3-
; RUN: tr -d '\r' <%p/Inputs/webpage1.html > ./webpage1.html
4-
; RUN: tr -d '\r' <%p/Inputs/webpage2.html > ./webpage2.html
2+
; RUN: cp %p/Inputs/webpage*.html .
53
; RUN: llvm-rc -no-preprocess /FO %t/tag-html.res -- %p/Inputs/tag-html.rc
64
; RUN: llvm-readobj %t/tag-html.res | FileCheck %s --check-prefix HTML
75

0 commit comments

Comments
 (0)