Author: dyung Date: Tue Jun 18 20:02:33 2019 New Revision: 363761 URL: http://llvm.org/viewvc/llvm-project?rev=363761&view=rev Log: [TEST] Fix test on Windows by looking for substrings rather than a regex since the escaping of special characters appears to break on Windows.
Modified: clang-tools-extra/trunk/clangd/unittests/TweakTests.cpp Modified: clang-tools-extra/trunk/clangd/unittests/TweakTests.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/unittests/TweakTests.cpp?rev=363761&r1=363760&r2=363761&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/unittests/TweakTests.cpp (original) +++ clang-tools-extra/trunk/clangd/unittests/TweakTests.cpp Tue Jun 18 20:02:33 2019 @@ -239,10 +239,13 @@ TEST(TweakTest, DumpAST) { checkNotAvailable(ID, "/*c^omment*/ int foo() return 2 ^ + 2; }"); const char *Input = "int x = 2 ^+ 2;"; - const char *Output = R"(BinaryOperator.*'\+'.* -.*IntegerLiteral.*'int' 2.* -.*IntegerLiteral.*'int' 2.*)"; - EXPECT_THAT(getMessage(ID, Input), ::testing::MatchesRegex(Output)); + auto result = getMessage(ID, Input); + EXPECT_THAT(result, ::testing::HasSubstr("BinaryOperator")); + EXPECT_THAT(result, ::testing::HasSubstr("'+'")); + EXPECT_THAT(result, ::testing::HasSubstr("|-IntegerLiteral")); + EXPECT_THAT(result, + ::testing::HasSubstr("<col:9> 'int' 2\n`-IntegerLiteral")); + EXPECT_THAT(result, ::testing::HasSubstr("<col:13> 'int' 2")); } TEST(TweakTest, ShowSelectionTree) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits