[GN/iOS] Explicitly list test data in net_unittests_bundle_data.

net/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
@@ skipping 569 matching lines @@
     deps = [
       ":net",
       ":test_support",
       "//base",
       "//build/config/sanitizers:deps",
     ]
   }
 }
 
 bundle_data("test_support_bundle_data") {
+  visibility = [ ":test_support" ]
   testonly = true
-  sources = [
-    "data/ssl/certificates",
-  ]
+  sources = gypi_values.net_test_support_data_sources
   outputs = [
     "{{bundle_resources_dir}}/" +
         "{{source_root_relative_dir}}/{{source_file_part}}",
   ]
 }
 
 source_set("test_support") {
   testonly = true
   sources = [
     "base/load_timing_info_test_util.cc",
@@ skipping 91 matching lines @@
     ]
   }
 
   configs += [
     "//build/config:precompiled_headers",
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 
-  deps = [
-    ":test_support_bundle_data",
-  ]
-
   public_deps = [
     "//base",
     "//base/test:test_support",
     "//crypto",
     "//net",
     "//net/tools/tld_cleanup",
     "//testing/gmock",
     "//testing/gtest",
     "//url",
   ]
 
+  deps = [
+    ":test_support_bundle_data",
+  ]
+
   if (!is_ios) {
     public_deps += [ "//third_party/protobuf:py_proto" ]
   }
 
   if (use_nss_verifier) {
     public_deps += [ "//crypto:platform" ]
   }
 
   if (is_android) {
     sources += [
@@ skipping 670 matching lines @@
       "//base",
       "//build/config/sanitizers:deps",
       "//third_party/boringssl",
       "//third_party/protobuf:protobuf_lite",
     ]
   }
 }
 
 bundle_data("net_unittests_bundle_data") {
   testonly = true
-  sources = [
-    "data/certificate_policies_unittest",
-    "data/name_constraints_unittest",
-    "data/parse_certificate_unittest",
-    "data/parse_ocsp_unittest",
-    "data/test.html",
-    "data/url_request_unittest",
-    "data/verify_certificate_chain_unittest",
-    "data/verify_name_match_unittest/names",
-    "third_party/nist-pkits/certs",
-    "third_party/nist-pkits/crls",
-  ]
+  sources = gypi_values.net_unittests_data_sources
   outputs = [
     "{{bundle_resources_dir}}/" +
         "{{source_root_relative_dir}}/{{source_file_part}}",
   ]
 }
 
 test("net_unittests") {
   sources = gypi_values.net_test_sources
 
   configs += [
@@ skipping 21 matching lines @@
     "//net/base/registry_controlled_domains",
     "//sql",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/zlib",
     "//url",
     "//url:url_features",
   ]
 
   data = [
     "data/",

[eroman, 2016/04/20 18:04:05]

Why are these not a problem?

The current CL enumerates some data dependencies, but not all of the data
dependencies of net_unittests. Here, and in the following lines, there are other
data directory dependencies.

I am conceptually fine with individually listing each of the data dependencies,
if that is what we need to do.

However I would like to make sure we are using a consistent approach throughout
so it is clear when adding new test data where it goes and how to update. And
have a consistent failure mode when forgetting to enumerate new test files
(rather than it works some places but breaks mysteriously on other bots).

Apologies if I am being dense, but can you explain to me why we need to
enumerate some directories but not others?

[eroman, 2016/04/20 18:11:00]

Let me re-word:

I think my confusion is in understanding the end-goal -- do we want to
consistently itemize all data files individually, or do we only want to bother
itemizing individually the data files that may be used by test run on iOS.

The subset of data chosen from //net/data/* by this CL I believe is just the
latter. There are large swaths of data dependencies included by directory as
evidenced by the contents of //net/data, as well as the rest of this build file.

This in-between state is hard to understand. Thanks!

[sdefresne, 2016/04/20 18:13:51]

The "data" property of "test" target is not used on iOS (per design, as "data"
semantic is too weak to be used on iOS, see
https://docs.google.com/document/d/1bKh57hg6TSBsEmeh0zWpOO5SVGA2INu-D3FGgsyIC...).
The "data" is used by script that are run post-build (i.e. they use the same
mechanism as the isolate files). Since they do not optimise for no-operation is
there is no change to the source, they do not have to list individual files.

We are trying to converge on a single way to express the runtime dependencies
with gn but each platform still has its peculiarity. See
https://groups.google.com/a/chromium.org/d/msg/gn-dev/sHpsuzw501o/mJjG8VYjCQAJ
for the current discussion (still unresolved). It should not be a problem to use
the same file list for both variables though, I was just trying to fix the iOS
build and did want to risk breaking other platforms by changing how they build
the app and ship it to the bots.

[sdefresne, 2016/04/20 18:21:02]

Initially I wanted to try to list only individual files required on iOS but his
proved too hard (I spent almost a day running the app, watching the test fails,
finding which file was missing, adding it to bundle_data, rebuilding in a
cycle). Since we never bothered selecting which files to copy with gyp (we
listed the directory, which was flaky but copied all the files), I eventually
decided to copy all the files by individually listing them.
So, if I try to summarize, my CL tries to fix the flakyness of the build on iOS
(that is the only flaky platform due to its peculiar build system) without
affecting other platforms. I'd like to keep this change independent of removing
any duplication between iOS and the other platforms if possible.

Note that there already existed duplication before between "data" properties of
"test" targets" and "sources" properties of "bundle_data" targets.

   ]
   data_deps = []
 
   if (use_openssl) {
     data_deps += [ "third_party/nist-pkits/" ]
   }
 
   if (is_linux || is_mac || is_win) {
     deps += [
       "//third_party/pyftpdlib/",
@@ skipping 540 matching lines @@
   sources = [
     "socket/socks5_client_socket_fuzzer.cc",
   ]
   deps = [
     ":net_fuzzer_test_support",
     ":test_support",
     "//base",
     "//net",
   ]
 }