1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00

[MC] Fix regression tests on Windows when git “core.autocrlf” is set to true.

Differential Revision: https://reviews.llvm.org/D39737

This is the second attempt to commit this. The test was broken on Linux in the first attempt.

llvm-svn: 318560
This commit is contained in:
Zhen Cao 2017-11-17 21:59:43 +00:00
parent bb7a6d35dd
commit fe37e55f98
4 changed files with 19 additions and 0 deletions

12
.gitattributes vendored Normal file
View File

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

View File

@ -76,6 +76,11 @@ Here's the short story for getting up and running quickly with LLVM:
* With anonymous Subversion access: * With anonymous Subversion access:
*Note:* some regression tests require Unix-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>`` 1. ``cd <where-you-want-llvm-to-live>``
2. ``svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm`` 2. ``svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm``
3. ``cd llvm`` 3. ``cd llvm``

View File

@ -210,6 +210,8 @@ AsmToken AsmLexer::LexLineComment() {
int CurChar = getNextChar(); int CurChar = getNextChar();
while (CurChar != '\n' && CurChar != '\r' && CurChar != EOF) while (CurChar != '\n' && CurChar != '\r' && CurChar != EOF)
CurChar = getNextChar(); CurChar = getNextChar();
if (CurChar == '\r' && CurPtr != CurBuf.end() && *CurPtr == '\n')
++CurPtr;
// If we have a CommentConsumer, notify it about the comment. // If we have a CommentConsumer, notify it about the comment.
if (CommentConsumer) { if (CommentConsumer) {

Binary file not shown.