commit 92d41eb41fcb34f9046f72e38a56aac29a2d6e80
author Hans Wennborg <hans@chromium.org> Thu Nov 12 18:10:14 2020 +0000
committer Copybara-Service <copybara-worker@google.com> Fri Nov 20 17:25:17 2020 -0800
tree 30c508d176b329e68e67a19979ac90724b84fe06
parent e84c9a3fd75fdc39055b7ae27d6ec508e50bd39e

Remove zlib unittests from unit_tests; they have their own test binary

These tests are in zlib_unittests, and that's already built and run by
the bots (after crrev.com/804566).

This removes the redundancy of building and running them twice, and
takes some load of the already very large unit_tests target.

While here, also move the zip and compression_utils to zlib_unittests
and try to clean up chrome/test/BUILD.gn from unnecessary zlib
references.

Bug: 352073
Change-Id: I3cfe020df9bc2699bbb160ae95b511840589e054
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2534930
Commit-Queue: Hans Wennborg <hans@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826858}
GitOrigin-RevId: 49bce2f7a08bea183f39892a075be9ff92dc3c39

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 34d8c0a..d64cb38 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -428,12 +428,17 @@
       "contrib/tests/infcover.h",
       "contrib/tests/run_all_unittests.cc",
       "contrib/tests/utils_unittest.cc",
-      "google/compression_utils_portable.cc",
-      "google/compression_utils_portable.h",
+      "google/compression_utils_unittest.cc",
+      "google/zip_reader_unittest.cc",
+      "google/zip_unittest.cc",
     ]
 
+    data = [ "google/test/data/" ]
+
     deps = [
       ":zlib",
+      "google:compression_utils",
+      "google:zip",
       "//base/test:test_support",
       "//testing/gtest",
     ]

google/BUILD.gn

diff --git a/google/BUILD.gn b/google/BUILD.gn
index a49b8c8..c29e892 100644
--- a/google/BUILD.gn
+++ b/google/BUILD.gn
@@ -28,10 +28,10 @@
       "compression_utils.h",
     ]
     deps = [
-      ":compression_utils_portable",
       "//base",
       "//third_party/zlib",
     ]
+    public_deps = [ ":compression_utils_portable" ]
   }
 }