forked from OSchip/llvm-project
Revert "Try to unbreak buildbots after r298913."
llvm-svn: 298966
This commit is contained in:
parent
27b62ae077
commit
c9b250611f
|
@ -1513,17 +1513,21 @@ TEST_F(ApplyAtomicChangesTest, InsertsNewIncludesInRightOrder) {
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(ApplyAtomicChangesTest, RemoveAndSortIncludes) {
|
TEST_F(ApplyAtomicChangesTest, RemoveAndSortIncludes) {
|
||||||
setInput("#include \"a\"\n"
|
setInput(R"(
|
||||||
"#include \"b\"\n"
|
#include "a"
|
||||||
"#include \"c\"\n"
|
#include "b"
|
||||||
"\n"
|
#include "c"
|
||||||
"int a;");
|
|
||||||
|
int a;
|
||||||
|
)");
|
||||||
Changes.emplace_back(FilePath, "key1");
|
Changes.emplace_back(FilePath, "key1");
|
||||||
Changes.back().removeHeader("b");
|
Changes.back().removeHeader("b");
|
||||||
EXPECT_EQ("#include \"a\"\n"
|
EXPECT_EQ(R"(
|
||||||
"#include \"c\"\n"
|
#include "a"
|
||||||
"\n"
|
#include "c"
|
||||||
"int a;",
|
|
||||||
|
int a;
|
||||||
|
)",
|
||||||
rewrite());
|
rewrite());
|
||||||
}
|
}
|
||||||
TEST_F(ApplyAtomicChangesTest, InsertsSystemIncludes) {
|
TEST_F(ApplyAtomicChangesTest, InsertsSystemIncludes) {
|
||||||
|
@ -1549,19 +1553,23 @@ TEST_F(ApplyAtomicChangesTest, InsertsSystemIncludes) {
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST_F(ApplyAtomicChangesTest, RemoveSystemIncludes) {
|
TEST_F(ApplyAtomicChangesTest, RemoveSystemIncludes) {
|
||||||
setInput("#include <a>\n"
|
setInput(R"(
|
||||||
"#include <b>\n"
|
#include <a>
|
||||||
"\n"
|
#include <b>
|
||||||
"#include \"c\""
|
|
||||||
"\n"
|
#include "c"
|
||||||
"int a;");
|
|
||||||
|
int a;
|
||||||
|
)");
|
||||||
Changes.emplace_back(FilePath, "key1");
|
Changes.emplace_back(FilePath, "key1");
|
||||||
Changes.back().removeHeader("<a>");
|
Changes.back().removeHeader("<a>");
|
||||||
EXPECT_EQ("#include <b>\n"
|
EXPECT_EQ(R"(
|
||||||
"\n"
|
#include <b>
|
||||||
"#include \"c\""
|
|
||||||
"\n"
|
#include "c"
|
||||||
"int a;",
|
|
||||||
|
int a;
|
||||||
|
)",
|
||||||
rewrite());
|
rewrite());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue