From fd781bf0432d24a657fd33684b61b7f25147e24e Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Sun, 14 Nov 2010 03:28:22 +0000 Subject: FileCheck: Eliminate DOSish \r from input file. It can pass two tests below on Win32. - Clang :: CodeGenCXX/dyncast.cpp - LLVM :: CodeGen/ARM/globals.ll llvm-svn: 119023 --- llvm/utils/FileCheck/FileCheck.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'llvm/utils/FileCheck') diff --git a/llvm/utils/FileCheck/FileCheck.cpp b/llvm/utils/FileCheck/FileCheck.cpp index c6b2ff7c60e..5e30c22db35 100644 --- a/llvm/utils/FileCheck/FileCheck.cpp +++ b/llvm/utils/FileCheck/FileCheck.cpp @@ -456,6 +456,11 @@ static MemoryBuffer *CanonicalizeInputFile(MemoryBuffer *MB) { for (const char *Ptr = MB->getBufferStart(), *End = MB->getBufferEnd(); Ptr != End; ++Ptr) { + // Eliminate trailing dosish \r. + if (Ptr <= End - 2 && Ptr[0] == '\r' && Ptr[1] == '\n') { + continue; + } + // If C is not a horizontal whitespace, skip it. if (*Ptr != ' ' && *Ptr != '\t') { NewFile.push_back(*Ptr); -- cgit v1.2.3