replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DeclPrinter tests: simplify the code by using the new runToolOnCodeWithArgs 

function from Tooling.

llvm-svn: 162976
This commit is contained in:
Dmitri Gribenko 2012-08-31 03:23:26 +00:00
parent 9fc8b9c156
commit 454a43cf30
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
clang/unittests/AST/DeclPrinterTest.cpp
View File

@ -65,30 +65,9 @@ public:
}
};
bool runToolOnCode(clang::FrontendAction *ToolAction, const Twine &Code,
ArrayRef<const char *> ClangArgs) {
SmallString<16> FileNameStorage;
StringRef FileNameRef = "input.cc";
std::vector<std::string> ArgVector;
ArgVector.push_back("clang-tool");
ArgVector.push_back("-fsyntax-only");
ArgVector.push_back(FileNameRef.data());
for (unsigned i = 0, e = ClangArgs.size(); i != e; ++i)
ArgVector.push_back(ClangArgs[i]);
FileManager Files((FileSystemOptions()));
ToolInvocation Invocation(ArgVector, ToolAction, &Files);
SmallString<1024> CodeStorage;
Invocation.mapVirtualFile(FileNameRef,
Code.toNullTerminatedStringRef(CodeStorage));
return Invocation.run();
}
::testing::AssertionResult PrintedDeclMatches(
StringRef Code,
ArrayRef<const char *> ClangArgs,
const std::vector<std::string> &Args,
const DeclarationMatcher &NodeMatch,
StringRef ExpectedPrinted) {
PrintMatch Printer;
@ -96,7 +75,7 @@ bool runToolOnCode(clang::FrontendAction *ToolAction, const Twine &Code,
Finder.addMatcher(NodeMatch, &Printer);
OwningPtr<FrontendActionFactory> Factory(newFrontendActionFactory(&Finder));
if (!runToolOnCode(Factory->create(), Code, ClangArgs))
if (!runToolOnCodeWithArgs(Factory->create(), Code, Args))
return testing::AssertionFailure() << "Parsing error in \"" << Code << "\"";
if (Printer.getNumFoundDecls() == 0)
@ -119,8 +98,9 @@ bool runToolOnCode(clang::FrontendAction *ToolAction, const Twine &Code,
::testing::AssertionResult PrintedDeclCXX98Matches(StringRef Code,
StringRef DeclName,
StringRef ExpectedPrinted) {
std::vector<std::string> Args(1, "-std=c++98");
return PrintedDeclMatches(Code,
ArrayRef<const char *>("-std=c++98"),
Args,
namedDecl(hasName(DeclName)).bind("id"),
ExpectedPrinted);
}
@ -129,8 +109,9 @@ bool runToolOnCode(clang::FrontendAction *ToolAction, const Twine &Code,
StringRef Code,
const DeclarationMatcher &NodeMatch,
StringRef ExpectedPrinted) {
std::vector<std::string> Args(1, "-std=c++98");
return PrintedDeclMatches(Code,
ArrayRef<const char *>("-std=c++98"),
Args,
NodeMatch,
ExpectedPrinted);
}
@ -138,8 +119,9 @@ bool runToolOnCode(clang::FrontendAction *ToolAction, const Twine &Code,
::testing::AssertionResult PrintedDeclCXX11Matches(StringRef Code,
StringRef DeclName,
StringRef ExpectedPrinted) {
std::vector<std::string> Args(1, "-std=c++11");
return PrintedDeclMatches(Code,
ArrayRef<const char *>("-std=c++11"),
Args,
namedDecl(hasName(DeclName)).bind("id"),
ExpectedPrinted);
}
@ -148,8 +130,9 @@ bool runToolOnCode(clang::FrontendAction *ToolAction, const Twine &Code,
StringRef Code,
const DeclarationMatcher &NodeMatch,
StringRef ExpectedPrinted) {
std::vector<std::string> Args(1, "-std=c++11");
return PrintedDeclMatches(Code,
ArrayRef<const char *>("-std=c++11"),
Args,
NodeMatch,
ExpectedPrinted);
}