Skip to content

Commit

Permalink
[gitattributes] Mark some llvm-rc inputs as requiring LF newlines (ll…
Browse files Browse the repository at this point in the history
…vm#113222)

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.)
  • Loading branch information
mstorsjo authored and NoumanAmir657 committed Nov 4, 2024
1 parent 1705e86 commit dce3578
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 1 addition & 0 deletions llvm/.gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ test/tools/llvm-mca/X86/directives-handle-crlf.s text eol=crlf

# These files must have LF line endings because the test requires exact matching
test/Object/Inputs/*.tbd eol=lf
test/tools/llvm-rc/Inputs/webpage*.html text eol=lf
test/tools/llvm-strings/radix.test text eol=lf
test/tools/llvm-tapi-diff/Inputs/*.tbd text eol=lf
test/tools/split-file/basic.test text eol=lf
Expand Down
4 changes: 1 addition & 3 deletions llvm/test/tools/llvm-rc/tag-html.test
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
; RUN: rm -rf %t && mkdir %t && cd %t
; Remove `\r` in case Git on Windows decided to checkout with Windows newlines.
; RUN: tr -d '\r' <%p/Inputs/webpage1.html > ./webpage1.html
; RUN: tr -d '\r' <%p/Inputs/webpage2.html > ./webpage2.html
; RUN: cp %p/Inputs/webpage*.html .
; RUN: llvm-rc -no-preprocess /FO %t/tag-html.res -- %p/Inputs/tag-html.rc
; RUN: llvm-readobj %t/tag-html.res | FileCheck %s --check-prefix HTML

Expand Down

0 comments on commit dce3578

Please sign in to comment.