summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2015-05-11 20:24:15 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-12 03:24:37 +0000
commitcb2638bc4343b8b4298e4878f3451ca410b02e47 (patch)
tree08993615235fb98926a5a57c4f617793e5081a1d
parent1ebecb847cc6da9a045ab7b39afede429f2adac2 (diff)
downloadchromium_src-cb2638bc4343b8b4298e4878f3451ca410b02e47.zip
chromium_src-cb2638bc4343b8b4298e4878f3451ca410b02e47.tar.gz
chromium_src-cb2638bc4343b8b4298e4878f3451ca410b02e47.tar.bz2
Port Chromium's blink_tests target to GN.
Tested on Linux with the following command lines: $ gn gen out-gn/Debug $ ninja -C out-gn/Debug :blink_tests Tested on Android with the following command lines: $ gn gen out-gn-android/Debug --args='symbol_level=1 is_debug=true target_os="android" target_cpu="arm"' $ ninja -C out-gn-android/Debug :blink_tests BUG=483171 TEST=see above R=dpranke@chromium.org Review URL: https://codereview.chromium.org/1118863002 Cr-Commit-Position: refs/heads/master@{#329340}
-rw-r--r--BUILD.gn57
1 files changed, 56 insertions, 1 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 080c0ba..d41f2cd 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