Merge pull request #220 from acompany-develop/feature/sakamoto/update_gtest

update googletest 1.7.0 -> 1.10.0

Author: sakamoto-souta

packages/server/computation_container/Gtest.BUILD

@@ -1,14 +1,17 @@
 cc_library(
     name = "main",
     srcs = glob(
-        ["src/*.cc"],
-        exclude = ["src/gtest-all.cc"]
+        ["googletest/src/*.cc"],
+        exclude = ["googletest/src/gtest-all.cc"]
     ),
     hdrs = glob([
-        "include/**/*.h",
-        "src/*.h"
+        "googletest/include/**/*.h",
+        "googletest/src/*.h"
     ]),
-    copts = ["-Iexternal/gtest/include"],
+    includes = [
+        "googletest",
+        "googletest/include",
+    ],
     linkopts = ["-pthread"],
     visibility = ["//visibility:public"],
 )

packages/server/computation_container/WORKSPACE

@@ -5,10 +5,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 ##### gtest
 http_archive(
     name = "gtest",
-    url = "https://github.com/google/googletest/archive/release-1.7.0.zip",
-    sha256 = "b58cb7547a28b2c718d1e38aee18a3659c9e3ff52440297e965f5edffe34b6d0",
+    url = "https://github.com/google/googletest/archive/release-1.10.0.zip",
+    sha256 = "94c634d499558a76fa649edb13721dce6e98fb1e7018dfaeba3cd7a083945e91",
     build_file = "@//:Gtest.BUILD",
-    strip_prefix = "googletest-release-1.7.0",
+    strip_prefix = "googletest-release-1.10.0",
 )
 
 # Enable proto

packages/server/computation_container/test/README.md

@@ -19,7 +19,7 @@ cc_library(
     srcs = [
         "computation_test.cpp"
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     hdrs = [
         "computation_test.hpp",
     ],

packages/server/computation_container/test/benchmark/BUILD

@@ -14,7 +14,7 @@ cc_library(
     srcs = [
         "share_benchmark.hpp",
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     deps = [
         "@gtest//:main",
         "//random:random",

packages/server/computation_container/test/benchmark/computation_benchmark/BUILD

@@ -3,7 +3,7 @@ cc_library(
     srcs = [
         "computation_benchmark.cpp"
     ],
-    copts = ["-Iexternal/gtest/include","-DDEBUG"],
+    copts = ["-Iexternal/gtest/googletest/include","-DDEBUG"],
     hdrs = [
         "computation_benchmark.hpp",
     ],

packages/server/computation_container/test/integration_test/BUILD

@@ -4,7 +4,7 @@ cc_library(
     srcs = [
         "share_test.hpp",
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     deps = [
         "@gtest//:main",
         "//random:random",
@@ -57,7 +57,7 @@ cc_library(
     srcs = [
         "read_triple_from_bts_test.hpp",
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     deps = [
         "@gtest//:main",
         "//triple_handler:triple_handler",

packages/server/computation_container/test/integration_test/computation_test/BUILD

@@ -3,7 +3,7 @@ cc_library(
     srcs = [
         "computation_test.cpp"
     ],
-    copts = ["-Iexternal/gtest/include","-DDEBUG"],
+    copts = ["-Iexternal/gtest/googletest/include","-DDEBUG"],
     hdrs = [
         "computation_test.hpp",
     ],

packages/server/computation_container/test/unit_test/BUILD

@@ -3,7 +3,7 @@ cc_test(
     srcs = [
         "math_test.cpp",
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     deps = [
         "@gtest//:main",
         "@com_github_grpc_grpc//:grpc++",
@@ -21,7 +21,7 @@ cc_test(
     srcs = [
         "share_test.cpp",
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     deps = [
         "@gtest//:main",
         "@com_github_grpc_grpc//:grpc++",
@@ -37,7 +37,7 @@ cc_test(
     srcs = [
         "random_test.cpp",
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     deps = [
         "@gtest//:main",
         "//random:random",
@@ -50,7 +50,7 @@ cc_test(
     srcs = [
         "ctoc_test.cpp",
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     deps = [
         "@gtest//:main",
         "//server/computation_to_computation_container:server",
@@ -68,7 +68,7 @@ cc_test(
     srcs = [
         "fixed_point_test.cpp",
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     deps = [
         "@gtest//:main",
         "//fixed_point:fixed_point",
@@ -81,7 +81,7 @@ cc_test(
     srcs = [
         "transaction_queue_test.cpp"
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     deps = [
         "@gtest//:main",
        "//transaction_queue:transaction_queue"
@@ -93,7 +93,7 @@ cc_test(
     srcs = [
         "csprng_test.cpp"
     ],
-    copts = ["-Iexternal/gtest/include",],
+    copts = ["-Iexternal/gtest/googletest/include",],
     deps = [
         "@gtest//:main",
         "//random:csprng",
@@ -106,7 +106,7 @@ cc_test(
     srcs = [
         "log_test.cpp",
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     deps = [
         "@gtest//:main",
         "//logging:log",
@@ -119,7 +119,7 @@ cc_test(
     srcs = [
         "ctodb_test.cpp",
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     deps = [
         "@gtest//:main",
         "//client/computation_to_db:client",
@@ -136,7 +136,7 @@ cc_test(
     srcs = [
         "value_table_test.cpp",
     ],
-    copts = ["-Iexternal/gtest/include"],
+    copts = ["-Iexternal/gtest/googletest/include"],
     deps = [
         "@gtest//:main",
         "//value_table:valuetable",