[PATCH] D39737: [MC] Fix regression tests on Windows when git “core.autocrlf” is set to true
Zhen Cao via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 9 15:52:15 PST 2017
caoz updated this revision to Diff 122349.
caoz added a comment.
Thank Eli and Zachary for your help on source control system settings.
https://reviews.llvm.org/D39737
Files:
.gitattributes
docs/GettingStartedVS.rst
lib/MC/MCParser/AsmLexer.cpp
test/MC/AsmParser/preserve-comments-crlf.s
Index: test/MC/AsmParser/preserve-comments-crlf.s
===================================================================
--- /dev/null
+++ test/MC/AsmParser/preserve-comments-crlf.s
@@ -0,0 +1,13 @@
+ #RUN: llvm-mc -preserve-comments -n -triple i386-linux-gnu < %s > %t
+ #RUN: diff %s %t
+ .text
+
+foo: #Comment here
+ #comment here
+ nop
+ #if DIRECTIVE COMMENT
+ ## WHOLE LINE COMMENT
+ cmpl $196, %eax ## EOL COMMENT
+ #endif
+ .ident "clang version 3.9.0"
+ .section ".note.GNU-stack","", at progbits
Index: lib/MC/MCParser/AsmLexer.cpp
===================================================================
--- lib/MC/MCParser/AsmLexer.cpp
+++ lib/MC/MCParser/AsmLexer.cpp
@@ -210,6 +210,8 @@
int CurChar = getNextChar();
while (CurChar != '\n' && CurChar != '\r' && CurChar != EOF)
CurChar = getNextChar();
+ if (CurChar == '\r' && CurPtr != CurBuf.end() && *CurPtr == '\n')
+ ++CurPtr;
// If we have a CommentConsumer, notify it about the comment.
if (CommentConsumer) {
Index: docs/GettingStartedVS.rst
===================================================================
--- docs/GettingStartedVS.rst
+++ docs/GettingStartedVS.rst
@@ -76,6 +76,11 @@
* With anonymous Subversion access:
+ *Note:* some regression tests require Linux style line ending (``\n``). To
+ pass all regression tests, please add two lines *enable-auto-props = yes*
+ and *\* = svn:mime-type=application/octet-stream* to
+ ``C:\Users\<username>\AppData\Roaming\Subversion\config``.
+
1. ``cd <where-you-want-llvm-to-live>``
2. ``svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm``
3. ``cd llvm``
Index: .gitattributes
===================================================================
--- /dev/null
+++ .gitattributes
@@ -0,0 +1,12 @@
+# binary files
+test/Object/Inputs/*.a-* binary
+test/tools/dsymutil/Inputs/* binary
+test/tools/llvm-ar/Inputs/*.lib binary
+test/tools/llvm-objdump/Inputs/*.a binary
+test/tools/llvm-rc/Inputs/* binary
+test/tools/llvm-strings/Inputs/numbers binary
+test/MC/AsmParser/incbin_abcd binary
+test/YAMLParser/spec-09-02.test binary
+
+# Windows line ending test
+test/MC/AsmParser/preserve-comments-crlf.s text eol=crlf
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D39737.122349.patch
Type: text/x-patch
Size: 2203 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171109/0735bf9c/attachment.bin>
More information about the llvm-commits
mailing list