Index: BUILD.gn |
diff --git a/BUILD.gn b/BUILD.gn |
index a17ad099e665ccac888ded5918196d7e14cb2ad1..735392e52c83b87066615e956204186f191fbb2b 100644 |
--- a/BUILD.gn |
+++ b/BUILD.gn |
@@ -899,16 +899,32 @@ if (!is_ios) { |
testonly = true |
deps = [ |
- "//content/shell:content_shell", |
+ ":webkit_layout_tests", |
"//third_party/WebKit/public:all_blink", |
+ ] |
+ } |
+ |
+ # Layout tests runner |
+ # third_party/WebKit/Tools/Scripts/run-webkit-tests |
+ group("run_webkit_tests") { |
+ testonly = true |
+ deps = [ |
+ ":webkit_layout_tests", |
+ ] |
+ } |
+ |
+ # https://www.chromium.org/developers/testing/webkit-layout-tests |
+ group("webkit_layout_tests") { |
+ testonly = true |
+ |
+ data_deps = [ |
+ "//content/shell:content_shell", |
+ "//chrome/test:telemetry_gtest_wrapper", |
Dirk Pranke
2016/11/01 16:51:00
This should not depend on anything in //chrome. Ca
mithro
2016/11/03 04:19:52
It's unclear to me why all the telemetry targets s
|
"//tools/imagediff", |
] |
- # 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 += [ |
+ data_deps += [ |
"//breakpad:breakpad_unittests", |
"//breakpad:dump_syms", |
"//breakpad:microdump_stackwalk", |
@@ -920,27 +936,28 @@ if (!is_ios) { |
} |
if (is_win) { |
- deps += [ |
+ data_deps += [ |
"//components/test_runner:layout_test_helper", |
"//content/shell:content_shell_crash_service", |
] |
} |
if (!is_win && !is_android) { |
- deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] |
+ data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] |
} |
if (is_mac) { |
- deps += [ "//breakpad:dump_syms($host_toolchain)" ] |
+ data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] |
} |
if (is_linux) { |
- deps += [ "//breakpad:dump_syms($host_toolchain)" ] |
+ data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] |
} |
data = [ |
"//third_party/WebKit/LayoutTests/", |
"//third_party/WebKit/Tools/Scripts/", |
+ "$root_build_dir/resources/inspector/", |
Dirk Pranke
2016/11/01 16:51:00
This seems like it should actually be a data depen
mithro
2016/11/03 04:19:52
From what I can tell, these resources are actually
|
] |
} |
} |