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

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: 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') | no next file with comments »
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 abde495b65f41fc3bf9fa319af78ec0045156d4b..faeac59e037c43ead8775e347ca2715f999ef4b1 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -327,6 +327,8 @@ if (!is_android) {
configs += [ "//build/config:precompiled_headers" ]
+ data_deps = []
+
data = [
"data/",
"//content/test/data/",
@@ -342,7 +344,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) {
@@ -358,6 +359,9 @@ if (!is_android) {
if (is_linux) {
data += [ "$root_out_dir/libppapi_tests.so" ]
}
+ if (!is_mac) {
+ data_deps += [ "//chrome:packed_extra_resources" ]
+ }
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
ldflags = []
@@ -401,7 +405,7 @@ if (!is_android) {
deps += [ "//extensions:chrome_extensions_interactive_uitests" ]
# Runtime dependencies
- data_deps = [
+ data_deps += [
"//ppapi:ppapi_tests",
"//third_party/mesa:osmesa",
]
@@ -873,7 +877,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",
@@ -965,6 +968,10 @@ if (!is_android) {
"//third_party/widevine/cdm:widevine_test_license_server",
]
+ if (!is_mac) {
+ data_deps += [ "//chrome:packed_extra_resources" ]
+ }
+
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
# TODO(GYP) if (is_win) {
@@ -1393,7 +1400,6 @@ if (!is_android) {
"//third_party/pywebsocket/",
"//third_party/tlslite/",
"$root_out_dir/pyproto/",
- "$root_out_dir/resources.pak",
]
if (is_linux || is_win) {
@@ -1436,6 +1442,10 @@ if (!is_android) {
"//third_party/mesa:osmesa",
]
+ if (!is_mac) {
+ data_deps += [ "//chrome:packed_extra_resources" ]
+ }
+
if (is_mac) {
# Dictionary sync is disabled on Mac.
sources -= [
@@ -1601,7 +1611,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 += [
@@ -1701,6 +1710,13 @@ test("unit_tests") {
]
}
+ if (is_mac) {
+ data_deps += [ "//chrome:chrome_framework" ]
+ data += [ "$root_out_dir/Chromium Framework.framework/" ]
+ } else {
+ data_deps += [ "//chrome:packed_extra_resources" ]
+ }
+
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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698