Chromium Code Reviews| Index: BUILD.gn |
| diff --git a/BUILD.gn b/BUILD.gn |
| index 265ddc066fd2b8f000fc3559885d42624a23dc59..cfc02cee68fabc1a2eebec64599dc7577c0f2c43 100644 |
| --- a/BUILD.gn |
| +++ b/BUILD.gn |
| @@ -132,7 +132,10 @@ group("both_gn_and_gyp") { |
| "//skia:skia_unittests", |
| "//sql:sql_unittests", |
| "//sync:sync_unit_tests", |
| - "//third_party/WebKit/public:blink_tests", |
| + "//third_party/WebKit/Source/platform:heap_unittests", |
| + "//third_party/WebKit/Source/platform:platform_unittests", |
| + "//third_party/WebKit/Source/web:webkit_unit_tests", |
| + "//third_party/WebKit/Source/wtf:wtf_unittests", |
| "//third_party/cacheinvalidation:cacheinvalidation_unittests", |
| "//third_party/codesighs", |
| "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests", |
| @@ -542,6 +545,11 @@ group("both_gn_and_gyp") { |
| "//extensions:extensions_browsertests", # TODO(GYP) |
| "//extensions:extensions_unittests", # TODO(GYP) |
| "//net:net_unittests", # TODO(GYP) |
| + |
| + # TODO(GYP): Re-enable this as soon as we can link Blink binaries on mac. |
| + "//third_party/WebKit/Source/platform:heap_unittests", |
| + "//third_party/WebKit/Source/platform:platform_unittests", |
| + "//third_party/WebKit/Source/web:webkit_unit_tests", |
| "//ui/app_list:app_list_unittests", # TODO(GYP) |
| "//ui/gfx:gfx_unittests", # TODO(GYP) |
| ] |
| @@ -719,6 +727,58 @@ group("gn_visibility") { |
| ] |
| } |
| +if (!is_ios) { |
| + group("blink_tests") { |
| + testonly = true |
| + |
| + deps = [ |
| + "//third_party/WebKit/Source/platform:heap_unittests", |
| + "//third_party/WebKit/Source/platform:platform_unittests", |
| + "//third_party/WebKit/Source/web:webkit_unit_tests", |
| + "//third_party/WebKit/Source/wtf:wtf_unittests", |
| + ] |
| + |
| + if (is_android) { |
| + deps += [ |
| + "//breakpad:dump_syms($host_toolchain)", |
|
brettw
2015/05/07 16:56:23
I wouldn't expect any of these targets to be in th
Dirk Pranke
2015/05/07 17:07:10
The latter (the test infrastructure wants them to
|
| + "//breakpad:minidump_stackwalk($host_toolchain)", |
| + "//content/shell/android:content_shell_apk", |
| + ] |
| + } else { |
| + deps += [ "//content/shell:content_shell" ] |
| + } |
| + |
| + if (is_win) { |
| + deps += [ |
| + #'../content/content_shell_and_tests.gyp:content_shell_crash_service', TODO(GYP) |
| + #'../content/content_shell_and_tests.gyp:layout_test_helper', TODO(GYP) |
| + ] |
| + } |
| + |
| + if (!is_win && !is_android) { |
| + deps += [ "//breakpad:minidump_stackwalk" ] |
| + } |
| + |
| + if (is_mac) { |
| + deps += [ |
| + "//breakpad:dump_syms($host_toolchain)", |
| + #'../content/content_shell_and_tests.gyp:layout_test_helper', TODO(GYP) |
| + ] |
| + |
| + # TODO(GYP): Re-enable this as soon as we can link Blink binaries on mac. |
| + deps -= [ |
| + "//third_party/WebKit/Source/platform:heap_unittests", |
| + "//third_party/WebKit/Source/platform:platform_unittests", |
| + "//third_party/WebKit/Source/web:webkit_unit_tests", |
| + ] |
| + } |
| + |
| + if (is_linux) { |
| + deps += [ "//breakpad:dump_syms($host_toolchain)" ] |
| + } |
| + } |
| +} |
| + |
| if (is_linux) { |
| # This group corresponds to the list of tests run on the waterfall for |
| # desktop Linux GYP builds from testing/buildbot/chromium.linux.json. It's |