aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/singlejar
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/singlejar')
-rw-r--r--src/tools/singlejar/BUILD28
-rw-r--r--src/tools/singlejar/combiners_test.cc2
-rw-r--r--src/tools/singlejar/desugar_checking_test.cc2
-rw-r--r--src/tools/singlejar/input_jar_bad_jar_test.cc2
-rw-r--r--src/tools/singlejar/input_jar_empty_jar_test.cc2
-rw-r--r--src/tools/singlejar/input_jar_preambled_test.cc2
-rw-r--r--src/tools/singlejar/input_jar_random_jars_test.cc2
-rw-r--r--src/tools/singlejar/input_jar_scan_entries_test.h2
-rw-r--r--src/tools/singlejar/options_test.cc2
-rw-r--r--src/tools/singlejar/output_huge_jar_test.cc2
-rw-r--r--src/tools/singlejar/output_jar_simple_test.cc2
-rw-r--r--src/tools/singlejar/test_util.cc2
-rw-r--r--src/tools/singlejar/token_stream_test.cc2
-rw-r--r--src/tools/singlejar/transient_bytes_test.cc2
-rw-r--r--src/tools/singlejar/zip_headers_test.cc2
-rw-r--r--src/tools/singlejar/zlib_interface_test.cc2
16 files changed, 30 insertions, 28 deletions
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 {
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 04:34:27 +0000