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

Unified Diff: chrome/test/BUILD.gn

Issue 1944943003: [Mac/GN] Start running components_unittests, components_browsertests, and unit_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pain and suffering, aka having two build systems Created 4 years, 7 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 | components/BUILD.gn » ('j') | components/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 4e6912309a9685e58a095a9f57cfca2adde537d1..afef676a626796c51a19c3bb916f10cc09e4bf46 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -309,7 +309,6 @@ if (!is_android) {
"//third_party/zlib/google/test/data/",
"//tools/metrics/histograms/histograms.xml",
"$root_out_dir/pyproto/google/",
- "$root_out_dir/resources.pak",
"$root_out_dir/ui_test.pak",
]
if (is_linux || is_win) {
@@ -325,6 +324,9 @@ if (!is_android) {
if (is_linux) {
data += [ "$root_out_dir/libppapi_tests.so" ]
}
+ if (!is_mac) {
+ data += [ "$root_out_dir/resources.pak" ]
Dirk Pranke 2016/05/05 22:59:15 Really I think these should be data_deps += [ "//c
Robert Sesek 2016/05/06 20:52:25 Agree that this makes more sense as data_deps[] bu
Dirk Pranke 2016/05/06 20:56:34 I've been fixing this where I've noticed it. I agr
Robert Sesek 2016/05/06 22:11:04 OK, I've updated it here.
+ }
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
ldflags = []
@@ -868,7 +870,6 @@ if (!is_android) {
"$root_out_dir/chrome_material_200_percent.pak",
"$root_out_dir/locales/",
"$root_out_dir/remoting/unittests/",
- "$root_out_dir/resources.pak",
"$root_out_dir/resources/extension/",
"$root_out_dir/test_case.html",
"$root_out_dir/test_case.html.mock-http-headers",
@@ -880,6 +881,9 @@ if (!is_android) {
if (is_win) {
data += [ "$root_out_dir/chrome_200_percent.pak" ]
}
+ if (!is_mac) {
+ data += [ "$root_out_dir/resources.pak" ]
+ }
deps = [
":browser_tests_js_webui",
@@ -1385,7 +1389,6 @@ if (!is_android) {
"//third_party/pywebsocket/",
"//third_party/tlslite/",
"$root_out_dir/pyproto/",
- "$root_out_dir/resources.pak",
]
if (is_linux || is_win) {
@@ -1397,6 +1400,9 @@ if (!is_android) {
"$root_out_dir/locales/en-US.pak",
]
}
+ if (!is_mac) {
+ data += [ "$root_out_dir/resources.pak" ]
+ }
# TODO(phajdan.jr): Only temporary, to make transition easier.
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
@@ -1593,7 +1599,6 @@ test("unit_tests") {
"//third_party/zlib/google/test/data/",
"//tools/metrics/histograms/histograms.xml",
"$root_out_dir/pyproto/google/",
- "$root_out_dir/resources.pak",
]
if (is_android || is_linux || is_win) {
data += [
@@ -1608,6 +1613,11 @@ test("unit_tests") {
"$root_out_dir/chrome_material_200_percent.pak",
]
}
+ if (!is_mac) {
+ data += [ "$root_out_dir/resources.pak" ]
+ } else {
+ data += [ "$root_out_dir/Chromium Framework.framework/" ]
+ }
defines = []
@@ -1693,6 +1703,10 @@ test("unit_tests") {
]
}
+ if (is_mac) {
+ deps += [ "//chrome:chrome_framework" ]
+ }
+
if (is_android) {
sources += rebase_path(
chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_sources,
« no previous file with comments | « no previous file | components/BUILD.gn » ('j') | components/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698