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

Unified Diff: BUILD.gn

Issue 1118863002: Port Chromium's blink_tests target to GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dirk's comment Created 5 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 080c0ba9a9576417e2f2a2bd61f067728cf8792e..d41f2cdfc418ec5fb800200aae2ccc31ba95df63 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,53 @@ group("gn_visibility") {
]
}
+if (!is_ios) {
+ # This group includes all of the targets needed to build and test Blink,
+ # including running the layout tests (see below).
+ group("blink_tests") {
+ testonly = true
+
+ deps = [
+ "//third_party/WebKit/public:all_blink",
+ ]
+
+ # NOTE: The following deps are needed to run the layout tests
+ # (run-webkit-tests) but there is no GN target for the layout tests,
+ # so we need to specify the dependencies here instead.
+ if (is_android) {
+ deps += [
+ "//breakpad:dump_syms($host_toolchain)",
+ "//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)
+ ]
+ }
+
+ 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
« 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