From 95ed4c38353509bb3e930ccdde37369c8136a331 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Fri, 26 Jul 2019 22:10:44 +0000 Subject: [PATCH] Fix remarks unit test on Windows "no such file or directory" vs "No such file or directory" llvm-svn: 367159 --- llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp b/llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp index eb5f24e..d821049 100644 --- a/llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp +++ b/llvm/unittests/Remarks/YAMLRemarksParsingTest.cpp @@ -63,6 +63,14 @@ bool parseExpectError(const char (&Buf)[N], const char *Error) { return StringRef(Stream.str()).contains(Error); } +static std::string toLower(StringRef S) { + std::string R; + R.reserve(S.size()); + for (char C : S) + R += std::tolower(C); + return R; +} + void parseExpectErrorMeta(StringRef Buf, const char *Error) { std::string ErrorStr; raw_string_ostream Stream(ErrorStr); @@ -71,7 +79,10 @@ void parseExpectErrorMeta(StringRef Buf, const char *Error) { remarks::createRemarkParserFromMeta(remarks::Format::YAML, Buf); handleAllErrors(MaybeParser.takeError(), [&](const ErrorInfoBase &EIB) { EIB.log(Stream); }); - EXPECT_EQ(Stream.str(), Error); + + // Use a case insensitive comparision due to case differences in error strings + // for different OSs. + EXPECT_EQ(toLower(Stream.str()), toLower(Error)); } TEST(YAMLRemarks, ParsingEmpty) { -- 2.7.4