From e669bbbb7265a7d4d59bac2d3889194efa167ea8 Mon Sep 17 00:00:00 2001 From: Luke Drummond Date: Fri, 18 Oct 2024 21:16:24 +0100 Subject: [PATCH] Revert "Finally formalise our defacto line-ending policy" This reverts commit dccebddb3b802c4c1fe287222e454b63f850f012. --- .gitattributes | 7 ------- clang-tools-extra/clangd/test/.gitattributes | 3 --- clang/test/.gitattributes | 4 ---- llvm/docs/TestingGuide.rst | 6 ------ llvm/test/FileCheck/.gitattributes | 1 - llvm/test/tools/llvm-ar/Inputs/.gitattributes | 1 - llvm/utils/lit/tests/Inputs/shtest-shell/.gitattributes | 1 - 7 files changed, 23 deletions(-) delete mode 100644 clang-tools-extra/clangd/test/.gitattributes delete mode 100644 clang/test/.gitattributes delete mode 100644 llvm/test/FileCheck/.gitattributes delete mode 100644 llvm/test/tools/llvm-ar/Inputs/.gitattributes delete mode 100644 llvm/utils/lit/tests/Inputs/shtest-shell/.gitattributes diff --git a/.gitattributes b/.gitattributes index aced01d485c1..6b281f33f737 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,3 @@ -# Checkout as native, commit as LF except in specific circumstances -* text=auto -*.bat text eol=crlf -*.rc text eol=crlf -*.sln text eol=crlf -*.natvis text eol=crlf - libcxx/src/**/*.cpp merge=libcxx-reformat libcxx/include/**/*.h merge=libcxx-reformat diff --git a/clang-tools-extra/clangd/test/.gitattributes b/clang-tools-extra/clangd/test/.gitattributes deleted file mode 100644 index 20971adc2b5d..000000000000 --- a/clang-tools-extra/clangd/test/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -input-mirror.test text eol=crlf -too_large.test text eol=crlf -protocol.test text eol=crlf diff --git a/clang/test/.gitattributes b/clang/test/.gitattributes deleted file mode 100644 index 160fc6cf5617..000000000000 --- a/clang/test/.gitattributes +++ /dev/null @@ -1,4 +0,0 @@ -FixIt/fixit-newline-style.c text eol=crlf -Frontend/system-header-line-directive-ms-lineendings.c text eol=crlf -Frontend/rewrite-includes-mixed-eol-crlf.* text eol=crlf -clang/test/Frontend/rewrite-includes-mixed-eol-lf.h text eolf=lf diff --git a/llvm/docs/TestingGuide.rst b/llvm/docs/TestingGuide.rst index 344a295226f6..08617933519f 100644 --- a/llvm/docs/TestingGuide.rst +++ b/llvm/docs/TestingGuide.rst @@ -360,12 +360,6 @@ Best practices for regression tests - Try to give values (including variables, blocks and functions) meaningful names, and avoid retaining complex names generated by the optimization pipeline (such as ``%foo.0.0.0.0.0.0``). -- If your tests depend on specific input file encodings, beware of line-ending - issues across different platforms, and in the project's history. Before you - commit tests that depend on explicit encodings, consider adding filetype or - specific line-ending annotations to a `<.gitattributes - https://git-scm.com/docs/gitattributes#_effects>`_ file in the appropriate - directory in the repository. Extra files ----------- diff --git a/llvm/test/FileCheck/.gitattributes b/llvm/test/FileCheck/.gitattributes deleted file mode 100644 index ba27d7fad76d..000000000000 --- a/llvm/test/FileCheck/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -dos-style-eol.txt text eol=crlf diff --git a/llvm/test/tools/llvm-ar/Inputs/.gitattributes b/llvm/test/tools/llvm-ar/Inputs/.gitattributes deleted file mode 100644 index 6c8a26285daf..000000000000 --- a/llvm/test/tools/llvm-ar/Inputs/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -mri-crlf.mri text eol=crlf diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/.gitattributes b/llvm/utils/lit/tests/Inputs/shtest-shell/.gitattributes deleted file mode 100644 index 2df17345df5b..000000000000 --- a/llvm/utils/lit/tests/Inputs/shtest-shell/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.dos text eol=crlf