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

diff --git a/lib/Tooling/StandaloneExecution.cpp b/lib/Tooling/StandaloneExecution.cpp
index aade40b62a1400b8389ff8d84e27711c0501905b..e52e4a611f99c4e0d06e84733121b9ecddc5bcb0 100644 (file)
--- 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 da482b88f5b81062a130a42a095c587fae47fed0..44e37b40093c62b15590afe1a14e8d627e9da218 100644 (file)
--- a/unittests/Tooling/ExecutionTest.cpp
+++ b/unittests/Tooling/ExecutionTest.cpp
@@ -183,10 +183,10 @@ TEST(CreateToolExecutorTest, CreateTestToolExecutor) {
 }
 
 TEST(StandaloneToolTest, SynctaxOnlyActionOnSimpleCode) {
-  FixedCompilationDatabase Compilations("/", std::vector<std::string>());
+  FixedCompilationDatabase Compilations(".", std::vector<std::string>());
   StandaloneToolExecutor Executor(Compilations,
-                                  std::vector<std::string>(1, "/a.cc"));
-  Executor.mapVirtualFile("/a.cc", "int x = 0;");
+                                  std::vector<std::string>(1, "a.cc"));
+  Executor.mapVirtualFile("a.cc", "int x = 0;");
 
   auto Err = Executor.execute(newFrontendActionFactory<SyntaxOnlyAction>(),
                               getClangSyntaxOnlyAdjuster());
@@ -194,10 +194,10 @@ TEST(StandaloneToolTest, SynctaxOnlyActionOnSimpleCode) {
 }
 
 TEST(StandaloneToolTest, SimpleAction) {
-  FixedCompilationDatabase Compilations("/", std::vector<std::string>());
+  FixedCompilationDatabase Compilations(".", std::vector<std::string>());
   StandaloneToolExecutor Executor(Compilations,
-                                  std::vector<std::string>(1, "/a.cc"));
-  Executor.mapVirtualFile("/a.cc", "int x = 0;");
+                                  std::vector<std::string>(1, "a.cc"));
+  Executor.mapVirtualFile("a.cc", "int x = 0;");
 
   auto Err = Executor.execute(std::unique_ptr<FrontendActionFactory>(
       new ReportResultActionFactory(Executor.getExecutionContext())));
@@ -207,10 +207,10 @@ TEST(StandaloneToolTest, SimpleAction) {
 }
 
 TEST(StandaloneToolTest, SimpleActionWithResult) {
-  FixedCompilationDatabase Compilations("/", std::vector<std::string>());
+  FixedCompilationDatabase Compilations(".", std::vector<std::string>());
   StandaloneToolExecutor Executor(Compilations,
-                                  std::vector<std::string>(1, "/a.cc"));
-  Executor.mapVirtualFile("/a.cc", "int x = 0; void f() {}");
+                                  std::vector<std::string>(1, "a.cc"));
+  Executor.mapVirtualFile("a.cc", "int x = 0; void f() {}");
 
   auto Err = Executor.execute(std::unique_ptr<FrontendActionFactory>(
       new ReportResultActionFactory(Executor.getExecutionContext())));