Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Unified Diff: net/BUILD.gn

Issue 1803423002: [iOS] Define bundle_data target for //net:net_unittests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-generated-files
Patch Set: Rebase on origin/master Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 758ef55b41527176e79b205a022ffb42da9b0812..fea8c61c304504052f2cfd7d414d73ab3ced9d9f 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -595,6 +595,17 @@ if (!is_ios) {
}
}
+bundle_data("test_support_bundle_data") {
+ testonly = true
+ sources = [
+ "data/ssl/certificates",
+ ]
+ outputs = [
+ "{{bundle_resources_dir}}/" +
+ "{{source_root_relative_dir}}/{{source_file_part}}",
+ ]
+}
+
source_set("test_support") {
testonly = true
sources = [
@@ -700,6 +711,10 @@ source_set("test_support") {
"//build/config/compiler:no_size_t_to_int_warning",
]
+ deps = [
+ ":test_support_bundle_data",
+ ]
+
public_deps = [
"//base",
"//base/test:test_support",
@@ -1372,6 +1387,23 @@ if (!is_ios) {
}
}
+bundle_data("net_unittests_bundle_data") {
+ testonly = true
+ sources = [
+ "data/certificate_policies_unittest",
+ "data/name_constraints_unittest",
+ "data/parse_certificate_unittest",
+ "data/test.html",
+ "data/url_request_unittest",
+ "data/verify_certificate_chain_unittest",
+ "data/verify_name_match_unittest/names",
+ ]
+ outputs = [
+ "{{bundle_resources_dir}}/" +
+ "{{source_root_relative_dir}}/{{source_file_part}}",
+ ]
+}
+
test("net_unittests") {
sources = gypi_values.net_test_sources
@@ -1396,6 +1428,7 @@ test("net_unittests") {
":extras",
":http_server",
":net",
+ ":net_unittests_bundle_data",
":simple_quic_tools",
":stale_while_revalidate_experiment_domains",
":test_support",
@@ -1618,26 +1651,6 @@ test("net_unittests") {
}
if (is_ios) {
- # TODO(GYP)
- # 'actions': [
- # {
- # 'action_name': 'copy_test_data',
- # 'variables': {
- # 'test_data_files': [
- # 'data/certificate_policies_unittest/',
- # 'data/name_constraints_unittest/',
- # 'data/parse_certificate_unittest/',
- # 'data/ssl/certificates/',
- # 'data/test.html',
- # 'data/url_request_unittest/',
- # 'data/verify_certificate_chain_unittest/',
- # 'data/verify_name_match_unittest/names/',
- # ],
- # 'test_data_prefix': 'net',
- # },
- # 'includes': [ '../build/copy_test_data_ios.gypi' ],
- # },
- # ],
sources -= [
# TODO(droger): The following tests are disabled because the
# implementation is missing or incomplete.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698