From: Eric Liu Date: Fri, 14 Oct 2016 10:10:26 +0000 (+0000) Subject: Try to fix windows bot file path style failure caused by r284219. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f01b6d693b389aee9645b79c8e98d26a48bfc6ed;p=clang Try to fix windows bot file path style failure caused by r284219. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@284222 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/unittests/Tooling/RefactoringTest.cpp b/unittests/Tooling/RefactoringTest.cpp index bf50b7d94d..81f0f1dc5b 100644 --- a/unittests/Tooling/RefactoringTest.cpp +++ b/unittests/Tooling/RefactoringTest.cpp @@ -974,20 +974,38 @@ TEST_F(MergeReplacementsTest, OverlappingRanges) { TEST(DeduplicateByFileTest, LeaveLeadingDotDot) { std::map FileToReplaces; +#if !defined(LLVM_ON_WIN32) FileToReplaces["../../a/b/.././c.h"] = Replacements(); FileToReplaces["../../a/c.h"] = Replacements(); +#else + FileToReplaces["..\\..\\a\\b\\..\\.\\c.h"] = Replacements(); + FileToReplaces["..\\..\\a\\c.h"] = Replacements(); +#endif FileToReplaces = groupReplacementsByFile(FileToReplaces); EXPECT_EQ(1u, FileToReplaces.size()); +#if !defined(LLVM_ON_WIN32) EXPECT_EQ("../../a/c.h", FileToReplaces.begin()->first); +#else + EXPECT_EQ("..\\..\\a\\c.h", FileToReplaces.begin()->first); +#endif } TEST(DeduplicateByFileTest, RemoveDotSlash) { std::map FileToReplaces; +#if !defined(LLVM_ON_WIN32) FileToReplaces["./a/b/.././c.h"] = Replacements(); FileToReplaces["a/c.h"] = Replacements(); +#else + FileToReplaces[".\\a\\b\\..\\.\\c.h"] = Replacements(); + FileToReplaces["a\\c.h"] = Replacements(); +#endif FileToReplaces = groupReplacementsByFile(FileToReplaces); EXPECT_EQ(1u, FileToReplaces.size()); +#if !defined(LLVM_ON_WIN32) EXPECT_EQ("a/c.h", FileToReplaces.begin()->first); +#else + EXPECT_EQ("a\\c.h", FileToReplaces.begin()->first); +#endif } } // end namespace tooling