Add dependency on googletest, so we can use gmock along with gtest.

third_party/gtest can go away after this.

RELNOTES: None.
PiperOrigin-RevId: 190221581

35 files changed, 91 insertions, 95 deletions

diff --git a/WORKSPACE b/WORKSPACE
index 3108c989be..cdf502da2d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -141,6 +141,15 @@ http_archive(
     sha256 = "62797e7cd7cc959419710cd25b075b5f5b247da0e8214d47bf5af9b32128fb0d",
 )
 
+http_archive(
+    name = "com_google_googletest",
+    urls = [
+        "https://github.com/google/googletest/archive/dfa853b63d17c787914b663b50c2095a0c5b706e.tar.gz",
+    ],
+    strip_prefix = "googletest-dfa853b63d17c787914b663b50c2095a0c5b706e",
+    sha256 = "313a16fba8f0be8ee20ba9883e044556044cbd1ae6cea532473d163a843ef991",
+)
+
 # For src/test/shell/bazel:bazel_sandboxing_test
 http_file(
   name = 'mount_path_toolchain',
diff --git a/src/test/cpp/BUILD b/src/test/cpp/BUILD
index 0e5f18cbcb..42f81129d1 100644
--- a/src/test/cpp/BUILD
+++ b/src/test/cpp/BUILD
@@ -22,7 +22,7 @@ cc_test(
     deps = [
         "//src/main/cpp:blaze_util",
         "//src/main/cpp/util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -36,7 +36,7 @@ cc_test(
         "//src/main/cpp:option_processor",
         "//src/main/cpp:workspace_layout",
         "//src/main/cpp/util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
         "@com_googlesource_code_re2//:re2",
     ],
 )
@@ -50,7 +50,7 @@ cc_test(
         "//src/main/cpp:option_processor",
         "//src/main/cpp:workspace_layout",
         "//src/main/cpp/util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -62,7 +62,7 @@ cc_test(
         "//src/main/cpp:blaze_util",
         "//src/main/cpp:startup_options",
         "//src/main/cpp:workspace_layout",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -74,7 +74,7 @@ cc_test(
         "//src/main/cpp:blaze_util",
         "//src/main/cpp:workspace_layout",
         "//src/main/cpp/util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
diff --git a/src/test/cpp/blaze_util_posix_test.cc b/src/test/cpp/blaze_util_posix_test.cc
index 20bdb4ba03..f32e57a498 100644
--- a/src/test/cpp/blaze_util_posix_test.cc
+++ b/src/test/cpp/blaze_util_posix_test.cc
@@ -27,7 +27,7 @@
 
 #include "src/main/cpp/blaze_util.h"
 #include "src/main/cpp/blaze_util_platform.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace blaze {
 
diff --git a/src/test/cpp/blaze_util_test.cc b/src/test/cpp/blaze_util_test.cc
index 51f2b917f4..94ed3b9f81 100644
--- a/src/test/cpp/blaze_util_test.cc
+++ b/src/test/cpp/blaze_util_test.cc
@@ -23,7 +23,7 @@
 #include "src/main/cpp/blaze_util.h"
 #include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/util/file.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace blaze {
 
diff --git a/src/test/cpp/blaze_util_windows_test.cc b/src/test/cpp/blaze_util_windows_test.cc
index 763ff563ca..5412019efa 100644
--- a/src/test/cpp/blaze_util_windows_test.cc
+++ b/src/test/cpp/blaze_util_windows_test.cc
@@ -22,7 +22,7 @@
 #include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/util/file.h"
 #include "src/main/cpp/util/strings.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace blaze {
 
diff --git a/src/test/cpp/option_processor_test.cc b/src/test/cpp/option_processor_test.cc
index 7a3d7782d8..b1a59efd61 100644
--- a/src/test/cpp/option_processor_test.cc
+++ b/src/test/cpp/option_processor_test.cc
@@ -20,7 +20,7 @@
 #include "src/main/cpp/util/file.h"
 #include "src/main/cpp/util/file_platform.h"
 #include "src/main/cpp/workspace_layout.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 #include "re2/re2.h"
 
 namespace blaze {
diff --git a/src/test/cpp/rc_options_test.cc b/src/test/cpp/rc_options_test.cc
index 46511e656e..3a3ebf3c0d 100644
--- a/src/test/cpp/rc_options_test.cc
+++ b/src/test/cpp/rc_options_test.cc
@@ -21,7 +21,7 @@
 #include "src/main/cpp/util/file_platform.h"
 #include "src/main/cpp/util/strings.h"
 #include "src/main/cpp/workspace_layout.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace blaze {
 using std::string;
diff --git a/src/test/cpp/startup_options_test.cc b/src/test/cpp/startup_options_test.cc
index a4c52a2621..d52ee3b597 100644
--- a/src/test/cpp/startup_options_test.cc
+++ b/src/test/cpp/startup_options_test.cc
@@ -18,7 +18,7 @@
 
 #include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/workspace_layout.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace blaze {
 
diff --git a/src/test/cpp/util/BUILD b/src/test/cpp/util/BUILD
index 1ddd8235fb..6fb3d5c5c0 100644
--- a/src/test/cpp/util/BUILD
+++ b/src/test/cpp/util/BUILD
@@ -14,7 +14,7 @@ cc_test(
     deps = [
         "//src/main/cpp/util",
         "//src/main/cpp/util:md5",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -32,7 +32,7 @@ cc_test(
     deps = [
         ":test_util",
         "//src/main/cpp/util:file",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ] + select({
         "//src/conditions:windows": [
             ":windows_test_util",
@@ -49,7 +49,7 @@ cc_test(
         "//src/main/cpp:blaze_util",
         "//src/main/cpp/util:bazel_log_handler",
         "//src/main/cpp/util:logging",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -58,7 +58,7 @@ cc_test(
     srcs = ["numbers_test.cc"],
     deps = [
         "//src/main/cpp/util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -68,7 +68,7 @@ cc_test(
     shard_count = 2,
     deps = [
         "//src/main/cpp/util:strings",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
diff --git a/src/test/cpp/util/file_posix_test.cc b/src/test/cpp/util/file_posix_test.cc
index 043a3ef5a3..abf479b4a7 100644
--- a/src/test/cpp/util/file_posix_test.cc
+++ b/src/test/cpp/util/file_posix_test.cc
@@ -20,7 +20,7 @@
 #include "src/main/cpp/util/file.h"
 #include "src/main/cpp/util/file_platform.h"
 #include "src/test/cpp/util/test_util.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace blaze_util {
 
diff --git a/src/test/cpp/util/file_test.cc b/src/test/cpp/util/file_test.cc
index 21b0afca51..14ecc79a59 100644
--- a/src/test/cpp/util/file_test.cc
+++ b/src/test/cpp/util/file_test.cc
@@ -22,7 +22,7 @@
 
 #include "src/main/cpp/util/file.h"
 #include "src/test/cpp/util/test_util.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace blaze_util {
 
diff --git a/src/test/cpp/util/logging_test.cc b/src/test/cpp/util/logging_test.cc
index 5779030c68..94be1f91dc 100644
--- a/src/test/cpp/util/logging_test.cc
+++ b/src/test/cpp/util/logging_test.cc
@@ -19,9 +19,18 @@
 #include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/util/bazel_log_handler.h"
 #include "src/main/cpp/util/logging.h"
-#include "gtest/gtest.h"
+#include "googlemock/include/gmock/gmock.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace blaze_util {
+using ::testing::HasSubstr;
+using ::testing::Not;
+// Note: gmock uses different regex syntax on different platforms. MatchesRegex
+// is still useful since the '.' wildcard can help match formatted log lines
+// like `[bazel INFO filename:134] message`
+// but should not be used for more fine grained testing.
+using ::testing::MatchesRegex;
+
 class LoggingTest : public ::testing::Test {
  protected:
   void SetUp() {
@@ -40,27 +49,23 @@ TEST(LoggingTest, BazelLogHandlerDumpsToCerrAtFail) {
   blaze_util::SetLogHandler(std::move(handler));
 
   // Log something.
-  std::string teststring = "test that the log messages get dumped to stderr";
+  std::string teststring = "test that log messages get dumped to stderr";
   BAZEL_LOG(INFO) << teststring;
 
   // Check that stderr isn't getting anything yet.
   std::string stderr_output = testing::internal::GetCapturedStderr();
-  EXPECT_TRUE(stderr_output.find(teststring) == std::string::npos)
-      << "stderr unexpectedly contains the log message, before log output was "
-         "set. Stderr contained: "
-      << stderr_output;
+  EXPECT_THAT(stderr_output, Not(HasSubstr(teststring)));
   testing::internal::CaptureStderr();
 
   // Destruct the log handler and get the stderr remains.
   blaze_util::SetLogHandler(nullptr);
   stderr_output = testing::internal::GetCapturedStderr();
-  EXPECT_TRUE(stderr_output.find(teststring) != std::string::npos)
-      << "stderr does not contain the expected message. Stderr contained: "
-      << stderr_output;
+  EXPECT_THAT(stderr_output, HasSubstr(teststring));
 }
 
 TEST(LoggingTest, LogLevelNamesMatch) {
   EXPECT_STREQ("INFO", LogLevelName(LOGLEVEL_INFO));
+  EXPECT_STREQ("USER", LogLevelName(LOGLEVEL_USER));
   EXPECT_STREQ("WARNING", LogLevelName(LOGLEVEL_WARNING));
   EXPECT_STREQ("ERROR", LogLevelName(LOGLEVEL_ERROR));
   EXPECT_STREQ("FATAL", LogLevelName(LOGLEVEL_FATAL));
@@ -74,17 +79,14 @@ TEST(LoggingTest, BazelLogDoesNotDumpToStderrIfOuputStreamSetToNull) {
   blaze_util::SetLogHandler(std::move(handler));
 
   // Log something.
-  std::string teststring = "test that the log message is lost.";
+  std::string teststring = "test that this log message is lost.";
   BAZEL_LOG(INFO) << teststring;
   blaze_util::SetLoggingOutputStream(nullptr);
 
   // Destruct the log handler and check if stderr got anything.
   blaze_util::SetLogHandler(nullptr);
   std::string stderr_output = testing::internal::GetCapturedStderr();
-  EXPECT_TRUE(stderr_output.find(teststring) == std::string::npos)
-      << "stderr unexpectedly contains the log message, even though log output "
-         "was explicitly set to null. Stderr contained: "
-      << stderr_output;
+  EXPECT_THAT(stderr_output, Not(HasSubstr(teststring)));
 }
 
 TEST(LoggingTest, DirectLogsToBufferStreamWorks) {
@@ -105,15 +107,11 @@ TEST(LoggingTest, DirectLogsToBufferStreamWorks) {
 
   // Check that output went to the buffer.
   std::string output(stringbuf_ptr->str());
-  EXPECT_TRUE(output.find(teststring) != std::string::npos)
-      << "log output is missing the log message, the output is: " << output;
+  EXPECT_THAT(output, HasSubstr(teststring));
 
   // Check that the output never went to stderr.
   std::string stderr_output = testing::internal::GetCapturedStderr();
-  EXPECT_TRUE(stderr_output.find(teststring) == std::string::npos)
-      << "stderr unexpectedly contains the log message that should have gone "
-         "to the specified string buffer. Stderr contained: "
-      << stderr_output;
+  EXPECT_THAT(stderr_output, Not(HasSubstr(teststring)));
 }
 
 TEST(LoggingTest, BufferedLogsSentToSpecifiedStream) {
@@ -127,12 +125,9 @@ TEST(LoggingTest, BufferedLogsSentToSpecifiedStream) {
       "test sending logs to the buffer before setting the output stream";
   BAZEL_LOG(INFO) << teststring;
 
-  // Check that stderr isn't getting anything yet.
+  // Check that stderr isn't getting anything.
   std::string stderr_output = testing::internal::GetCapturedStderr();
-  EXPECT_TRUE(stderr_output.find(teststring) == std::string::npos)
-      << "stderr unexpectedly contains the log message, before log output was "
-         "set. Stderr contained: "
-      << stderr_output;
+  EXPECT_THAT(stderr_output, Not(HasSubstr(teststring)));
   testing::internal::CaptureStderr();
 
   // Ask that the logs get output to a string buffer (keep a ptr to it so we can
@@ -143,15 +138,11 @@ TEST(LoggingTest, BufferedLogsSentToSpecifiedStream) {
 
   // Check that the buffered logs were sent.
   std::string output(stringbuf_ptr->str());
-  EXPECT_TRUE(output.find(teststring) != std::string::npos)
-      << "log output is missing the log message, the output is: " << output;
+  EXPECT_THAT(output, HasSubstr(teststring));
 
   // Check that the output did not go to stderr.
   stderr_output = testing::internal::GetCapturedStderr();
-  EXPECT_TRUE(stderr_output.find(teststring) == std::string::npos)
-      << "stderr unexpectedly contains the log message that should have gone "
-         "to the specified string buffer. Stderr contained: "
-      << stderr_output;
+  EXPECT_THAT(stderr_output, Not(HasSubstr(teststring)));
 }
 
 TEST(LoggingTest, DirectLogsToCerrWorks) {
@@ -171,9 +162,7 @@ TEST(LoggingTest, DirectLogsToCerrWorks) {
   // Cause the logs to be flushed, and capture them.
   blaze_util::SetLogHandler(nullptr);
   std::string stderr_output = testing::internal::GetCapturedStderr();
-  EXPECT_TRUE(stderr_output.find(teststring) != std::string::npos)
-      << "stderr does not contain the expected log message. Stderr contained: "
-      << stderr_output;
+  EXPECT_THAT(stderr_output, HasSubstr(teststring));
 }
 
 TEST(LoggingTest, BufferedLogsGetDirectedToCerr) {
@@ -193,9 +182,7 @@ TEST(LoggingTest, BufferedLogsGetDirectedToCerr) {
   // Cause the logs to be flushed, and capture them.
   blaze_util::SetLogHandler(nullptr);
   std::string stderr_output = testing::internal::GetCapturedStderr();
-  EXPECT_TRUE(stderr_output.find(teststring) != std::string::npos)
-      << "stderr does not contain the expected log message. Stderr contained: "
-      << stderr_output;
+  EXPECT_THAT(stderr_output, HasSubstr(teststring));
 }
 
 TEST(LoggingTest, ImpossibleFile) {
@@ -213,9 +200,7 @@ TEST(LoggingTest, ImpossibleFile) {
   // Cause the logs to be flushed, and capture them.
   blaze_util::SetLogHandler(nullptr);
   std::string stderr_output = testing::internal::GetCapturedStderr();
-  EXPECT_TRUE(stderr_output.find("ERROR") != std::string::npos);
-  EXPECT_TRUE(stderr_output.find("Provided stream failed") != std::string::npos)
-      << "stderr does not contain the expected error. Stderr contained: "
-      << stderr_output;
+  EXPECT_THAT(stderr_output,
+              MatchesRegex(".bazel ERROR.* Provided stream failed.\n"));
 }
 }  // namespace blaze_util
diff --git a/src/test/cpp/util/md5_test.cc b/src/test/cpp/util/md5_test.cc
index 2369969b0e..25364f9fc9 100644
--- a/src/test/cpp/util/md5_test.cc
+++ b/src/test/cpp/util/md5_test.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 #include "src/main/cpp/util/md5.h"
 #include "src/main/cpp/util/port.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace blaze_util {
 
diff --git a/src/test/cpp/util/numbers_test.cc b/src/test/cpp/util/numbers_test.cc
index 71e648798f..bb6e3716d2 100644
--- a/src/test/cpp/util/numbers_test.cc
+++ b/src/test/cpp/util/numbers_test.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 #include "src/main/cpp/util/numbers.h"
 #include "src/main/cpp/util/port.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace blaze_util {
 
diff --git a/src/test/cpp/util/strings_test.cc b/src/test/cpp/util/strings_test.cc
index 3d85695f6d..c4851a5202 100644
--- a/src/test/cpp/util/strings_test.cc
+++ b/src/test/cpp/util/strings_test.cc
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace blaze_util {
 
diff --git a/src/test/cpp/workspace_layout_test.cc b/src/test/cpp/workspace_layout_test.cc
index 781a54ebbe..98e157b0dd 100644
--- a/src/test/cpp/workspace_layout_test.cc
+++ b/src/test/cpp/workspace_layout_test.cc
@@ -20,7 +20,7 @@
 
 #include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/util/file.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace blaze {
 
diff --git a/src/test/native/BUILD b/src/test/native/BUILD
index 587f9ed352..a00458a3a3 100644
--- a/src/test/native/BUILD
+++ b/src/test/native/BUILD
@@ -22,7 +22,7 @@ cc_test(
         "//src/conditions:windows": [
             "//src/main/native/windows:lib-file",
             "//src/test/cpp/util:windows_test_util",
-            "//third_party:gtest",
+            "@com_google_googletest//:gtest_main",
         ],
         "//conditions:default": [],
     }),
diff --git a/src/tools/launcher/util/BUILD b/src/tools/launcher/util/BUILD
index 7a0c299585..8d128c3ee7 100644
--- a/src/tools/launcher/util/BUILD
+++ b/src/tools/launcher/util/BUILD
@@ -27,7 +27,7 @@ cc_test(
     srcs = ["launcher_util_test.cc"],
     deps = [
         ":util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -36,7 +36,7 @@ cc_test(
     srcs = ["data_parser_test.cc"],
     deps = [
         ":data_parser",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
diff --git a/src/tools/runfiles/BUILD b/src/tools/runfiles/BUILD
index d3545fd3e7..0df3386cad 100644
--- a/src/tools/runfiles/BUILD
+++ b/src/tools/runfiles/BUILD
@@ -65,7 +65,7 @@ cc_test(
     deps = [
         ":cc-runfiles",
         "//src/main/cpp/util:file",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD
index 72f15c1f24..dfdd2e3a73 100644
--- a/src/tools/singlejar/BUILD
+++ b/src/tools/singlejar/BUILD
@@ -69,8 +69,8 @@ cc_test(
     deps = [
         ":combiners",
         ":input_jar",
-        "//third_party:gtest",
         "//third_party/zlib",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -86,7 +86,7 @@ cc_test(
         ":input_jar",
         ":test_util",
         "//src/main/cpp/util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -102,7 +102,7 @@ cc_test(
         ":input_jar",
         ":test_util",
         "//src/main/cpp/util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -123,7 +123,7 @@ cc_test(
     deps = [
         ":input_jar",
         ":test_util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -139,7 +139,7 @@ cc_test(
     deps = [
         ":input_jar",
         ":test_util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -151,7 +151,7 @@ cc_test(
     deps = [
         ":input_jar",
         ":test_util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -166,7 +166,7 @@ cc_test(
         ":test_util",
         ":token_stream",
         "//src/main/cpp/util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -204,7 +204,7 @@ cc_test(
         ":output_jar",
         ":test_util",
         "//src/main/cpp/util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -216,7 +216,7 @@ cc_test(
     deps = [
         ":test_util",
         ":token_stream",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -233,8 +233,8 @@ cc_test(
     deps = [
         ":input_jar",
         ":test_util",
-        "//third_party:gtest",
         "//third_party/zlib",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -245,7 +245,9 @@ cc_test(
         "zip_headers_test.cc",
         ":zip_headers",
     ],
-    deps = ["//third_party:gtest"],
+    deps = [
+        "@com_google_googletest//:gtest_main",
+    ],
 )
 
 cc_test(
@@ -256,8 +258,8 @@ cc_test(
     ],
     deps = [
         ":test_util",
-        "//third_party:gtest",
         "//third_party/zlib",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
@@ -360,7 +362,7 @@ cc_library(
     hdrs = ["test_util.h"],
     deps = [
         "//src/main/cpp/util",
-        "//third_party:gtest",
+        "@com_google_googletest//:gtest_main",
     ],
 )
 
diff --git a/src/tools/singlejar/combiners_test.cc b/src/tools/singlejar/combiners_test.cc
index b1dd75f7b1..2ccae9e81a 100644
--- a/src/tools/singlejar/combiners_test.cc
+++ b/src/tools/singlejar/combiners_test.cc
@@ -17,7 +17,7 @@
 #include "src/tools/singlejar/input_jar.h"
 #include "src/tools/singlejar/zip_headers.h"
 #include "src/tools/singlejar/zlib_interface.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace {
 
diff --git a/src/tools/singlejar/desugar_checking_test.cc b/src/tools/singlejar/desugar_checking_test.cc
index faa6686178..8ff3698723 100644
--- a/src/tools/singlejar/desugar_checking_test.cc
+++ b/src/tools/singlejar/desugar_checking_test.cc
@@ -17,7 +17,7 @@
 #include "src/tools/singlejar/input_jar.h"
 #include "src/tools/singlejar/zip_headers.h"
 #include "src/tools/singlejar/zlib_interface.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 // A test fixture is used because friend access to class under test is needed.
 // Tests are instance methods to avoid gUnit dep in .h file.
diff --git a/src/tools/singlejar/input_jar_bad_jar_test.cc b/src/tools/singlejar/input_jar_bad_jar_test.cc
index 7b0507fec1..8ab1a67e92 100644
--- a/src/tools/singlejar/input_jar_bad_jar_test.cc
+++ b/src/tools/singlejar/input_jar_bad_jar_test.cc
@@ -16,7 +16,7 @@
 
 #include "src/tools/singlejar/input_jar.h"
 #include "src/tools/singlejar/test_util.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 static const char kJar[] = "jar.jar";
 
diff --git a/src/tools/singlejar/input_jar_empty_jar_test.cc b/src/tools/singlejar/input_jar_empty_jar_test.cc
index d9c75bd376..f806580046 100644
--- a/src/tools/singlejar/input_jar_empty_jar_test.cc
+++ b/src/tools/singlejar/input_jar_empty_jar_test.cc
@@ -34,7 +34,7 @@
 #include "src/main/cpp/util/strings.h"
 #include "src/tools/singlejar/input_jar.h"
 #include "src/tools/singlejar/test_util.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 using singlejar_test_util::OutputFilePath;
 using singlejar_test_util::AllocateFile;
diff --git a/src/tools/singlejar/input_jar_preambled_test.cc b/src/tools/singlejar/input_jar_preambled_test.cc
index 60600e8ebb..4bde581bd3 100644
--- a/src/tools/singlejar/input_jar_preambled_test.cc
+++ b/src/tools/singlejar/input_jar_preambled_test.cc
@@ -34,7 +34,7 @@
 #include "src/main/cpp/util/strings.h"
 #include "src/tools/singlejar/input_jar.h"
 #include "src/tools/singlejar/test_util.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace {
 
diff --git a/src/tools/singlejar/input_jar_random_jars_test.cc b/src/tools/singlejar/input_jar_random_jars_test.cc
index ffdc06376b..d18fdb351c 100644
--- a/src/tools/singlejar/input_jar_random_jars_test.cc
+++ b/src/tools/singlejar/input_jar_random_jars_test.cc
@@ -20,7 +20,7 @@
 
 #include "src/tools/singlejar/input_jar.h"
 
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace {
 
diff --git a/src/tools/singlejar/input_jar_scan_entries_test.h b/src/tools/singlejar/input_jar_scan_entries_test.h
index 8bf0fb6bcc..4e6b120f37 100644
--- a/src/tools/singlejar/input_jar_scan_entries_test.h
+++ b/src/tools/singlejar/input_jar_scan_entries_test.h
@@ -23,7 +23,7 @@
 #include "src/tools/singlejar/input_jar.h"
 #include "src/tools/singlejar/test_util.h"
 
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 static const char kJar[] = "jar.jar";
 static const char kXXXX[] = "4GB-1file";
diff --git a/src/tools/singlejar/options_test.cc b/src/tools/singlejar/options_test.cc
index 2d33227885..0e4e66de9d 100644
--- a/src/tools/singlejar/options_test.cc
+++ b/src/tools/singlejar/options_test.cc
@@ -18,7 +18,7 @@
 #include "src/tools/singlejar/test_util.h"
 
 #include "src/main/cpp/util/port.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 TEST(OptionsTest, Flags1) {
   const char *args[] = {"--exclude_build_data",
diff --git a/src/tools/singlejar/output_huge_jar_test.cc b/src/tools/singlejar/output_huge_jar_test.cc
index 6eefc7f24d..dd4e9e0151 100644
--- a/src/tools/singlejar/output_huge_jar_test.cc
+++ b/src/tools/singlejar/output_huge_jar_test.cc
@@ -22,7 +22,7 @@
 #include "src/tools/singlejar/options.h"
 #include "src/tools/singlejar/output_jar.h"
 #include "src/tools/singlejar/test_util.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace {
 
diff --git a/src/tools/singlejar/output_jar_simple_test.cc b/src/tools/singlejar/output_jar_simple_test.cc
index a0b946c214..5f83acbe7d 100644
--- a/src/tools/singlejar/output_jar_simple_test.cc
+++ b/src/tools/singlejar/output_jar_simple_test.cc
@@ -21,7 +21,7 @@
 #include "src/tools/singlejar/options.h"
 #include "src/tools/singlejar/output_jar.h"
 #include "src/tools/singlejar/test_util.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 #if !defined(JAR_TOOL_PATH)
 #error "The path to jar tool has to be defined via -DJAR_TOOL_PATH="
diff --git a/src/tools/singlejar/test_util.cc b/src/tools/singlejar/test_util.cc
index 5b63f80058..f8ea0de8a3 100644
--- a/src/tools/singlejar/test_util.cc
+++ b/src/tools/singlejar/test_util.cc
@@ -24,7 +24,7 @@
 #include "src/main/cpp/util/file_platform.h"
 #include "src/main/cpp/util/strings.h"
 
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace singlejar_test_util {
 
diff --git a/src/tools/singlejar/token_stream_test.cc b/src/tools/singlejar/token_stream_test.cc
index e277da3267..3597ed4979 100644
--- a/src/tools/singlejar/token_stream_test.cc
+++ b/src/tools/singlejar/token_stream_test.cc
@@ -18,7 +18,7 @@
 
 #include "src/tools/singlejar/test_util.h"
 #include "src/tools/singlejar/token_stream.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
diff --git a/src/tools/singlejar/transient_bytes_test.cc b/src/tools/singlejar/transient_bytes_test.cc
index a63305e363..ae46522dda 100644
--- a/src/tools/singlejar/transient_bytes_test.cc
+++ b/src/tools/singlejar/transient_bytes_test.cc
@@ -22,7 +22,7 @@
 #include "src/tools/singlejar/input_jar.h"
 #include "src/tools/singlejar/test_util.h"
 #include "src/tools/singlejar/transient_bytes.h"
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace {
 const char kStoredJar[] = "stored.zip";
diff --git a/src/tools/singlejar/zip_headers_test.cc b/src/tools/singlejar/zip_headers_test.cc
index 30003444fc..a2bfb61406 100644
--- a/src/tools/singlejar/zip_headers_test.cc
+++ b/src/tools/singlejar/zip_headers_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 #include "src/tools/singlejar/zip_headers.h"
 
diff --git a/src/tools/singlejar/zlib_interface_test.cc b/src/tools/singlejar/zlib_interface_test.cc
index 02c544aec9..9f9df05140 100644
--- a/src/tools/singlejar/zlib_interface_test.cc
+++ b/src/tools/singlejar/zlib_interface_test.cc
@@ -14,7 +14,7 @@
 
 #include "src/tools/singlejar/zlib_interface.h"
 
-#include "gtest/gtest.h"
+#include "googletest/include/gtest/gtest.h"
 
 namespace {