From 8084ad7fc6453b51a6422b6c73e41644910d7bd3 Mon Sep 17 00:00:00 2001 From: Eric Liu Date: Thu, 26 Oct 2017 13:09:50 +0000 Subject: [PATCH] Try to fix warnings and windows test failures caused by r316653 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@316661 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Tooling/StandaloneExecution.cpp | 2 +- unittests/Tooling/ExecutionTest.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/Tooling/StandaloneExecution.cpp b/lib/Tooling/StandaloneExecution.cpp index aade40b62a..e52e4a611f 100644 --- a/lib/Tooling/StandaloneExecution.cpp +++ b/lib/Tooling/StandaloneExecution.cpp @@ -62,7 +62,7 @@ llvm::Error StandaloneToolExecutor::execute( auto &Action = Actions.front(); Tool.appendArgumentsAdjuster(Action.second); Tool.appendArgumentsAdjuster(ArgsAdjuster); - if (int Ret = Tool.run(Action.first.get())) + if (Tool.run(Action.first.get())) return make_string_error("Failed to run action."); return llvm::Error::success(); diff --git a/unittests/Tooling/ExecutionTest.cpp b/unittests/Tooling/ExecutionTest.cpp index da482b88f5..44e37b4009 100644 --- a/unittests/Tooling/ExecutionTest.cpp +++ b/unittests/Tooling/ExecutionTest.cpp @@ -183,10 +183,10 @@ TEST(CreateToolExecutorTest, CreateTestToolExecutor) { } TEST(StandaloneToolTest, SynctaxOnlyActionOnSimpleCode) { - FixedCompilationDatabase Compilations("/", std::vector()); + FixedCompilationDatabase Compilations(".", std::vector()); StandaloneToolExecutor Executor(Compilations, - std::vector(1, "/a.cc")); - Executor.mapVirtualFile("/a.cc", "int x = 0;"); + std::vector(1, "a.cc")); + Executor.mapVirtualFile("a.cc", "int x = 0;"); auto Err = Executor.execute(newFrontendActionFactory(), getClangSyntaxOnlyAdjuster()); @@ -194,10 +194,10 @@ TEST(StandaloneToolTest, SynctaxOnlyActionOnSimpleCode) { } TEST(StandaloneToolTest, SimpleAction) { - FixedCompilationDatabase Compilations("/", std::vector()); + FixedCompilationDatabase Compilations(".", std::vector()); StandaloneToolExecutor Executor(Compilations, - std::vector(1, "/a.cc")); - Executor.mapVirtualFile("/a.cc", "int x = 0;"); + std::vector(1, "a.cc")); + Executor.mapVirtualFile("a.cc", "int x = 0;"); auto Err = Executor.execute(std::unique_ptr( new ReportResultActionFactory(Executor.getExecutionContext()))); @@ -207,10 +207,10 @@ TEST(StandaloneToolTest, SimpleAction) { } TEST(StandaloneToolTest, SimpleActionWithResult) { - FixedCompilationDatabase Compilations("/", std::vector()); + FixedCompilationDatabase Compilations(".", std::vector()); StandaloneToolExecutor Executor(Compilations, - std::vector(1, "/a.cc")); - Executor.mapVirtualFile("/a.cc", "int x = 0; void f() {}"); + std::vector(1, "a.cc")); + Executor.mapVirtualFile("a.cc", "int x = 0; void f() {}"); auto Err = Executor.execute(std::unique_ptr( new ReportResultActionFactory(Executor.getExecutionContext()))); -- 2.50.1