Chromium Code Reviews| Index: chrome/test/BUILD.gn |
| diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn |
| index b2916324649435176deb4cfc898f38c4a3bdc017..6aaee180335d60e880cba03d53666ad445dc6ec4 100644 |
| --- a/chrome/test/BUILD.gn |
| +++ b/chrome/test/BUILD.gn |
| @@ -24,6 +24,8 @@ import("//v8/gni/v8.gni") |
| if (is_android) { |
| import("//build/config/android/rules.gni") |
| +} else { |
| + skip_js_tests = is_asan || is_msan || is_tsan |
|
Dan Beam
2017/05/10 00:02:29
can we invert this to
include_js_tests = !(is_asa
dpapad
2017/05/10 00:06:38
Done.
|
| } |
| # This target exists to reference other test executables to bring these files |
| @@ -471,7 +473,6 @@ if (!is_android) { |
| "//chrome/browser", |
| "//chrome/browser/devtools", |
| "//chrome/renderer", |
| - "//chrome/test/data/webui:interactive_ui_tests_js_webui", |
| "//components/resources", |
| "//components/sync", |
| "//components/sync:test_support_model", |
| @@ -496,6 +497,10 @@ if (!is_android) { |
| "//ui/web_dialogs:test_support", |
| ] |
| + if (!skip_js_tests) { |
|
Dan Beam
2017/05/10 00:02:29
if (include_js_tests) {
dpapad
2017/05/10 00:06:38
Done.
|
| + deps += [ "//chrome/test/data/webui:interactive_ui_tests_js_webui" ] |
| + } |
| + |
| # TODO(rockot) bug 505926: The chrome_extensions_interactive_uitests target |
| # should be deleted and this line removed. See the |
| # chrome_extensions_interactive_uitests target for more. |
| @@ -1729,7 +1734,6 @@ test("browser_tests") { |
| "//chrome:strings", |
| "//chrome/browser", |
| "//chrome/renderer", |
| - "//chrome/test/data/webui:browser_tests_js_webui", |
| "//chrome/test/media_router:media_router_browsertests", |
| "//components/autofill/content/browser:risk_proto", |
| "//components/autofill/content/renderer:test_support", |
| @@ -1779,6 +1783,10 @@ test("browser_tests") { |
| "//v8", |
| ] |
| + if (!skip_js_tests) { |
| + deps += [ "//chrome/test/data/webui:browser_tests_js_webui" ] |
| + } |
| + |
| # Runtime dependencies |
| data_deps += [ |
| "//ppapi:ppapi_tests", |
| @@ -3660,10 +3668,12 @@ test("unit_tests") { |
| "../common/media_router/mojo/media_router_struct_traits_unittest.cc", |
| "../utility/media_router/dial_device_description_parser_impl_unittest.cc", |
| ] |
| - deps += [ |
| - "//chrome/test/data/webui:unit_tests_js", |
| - "//components/bubble:test_support", |
| - ] |
| + deps += [ "//components/bubble:test_support" ] |
| + |
| + if (!skip_js_tests) { |
| + deps += [ "//chrome/test/data/webui:unit_tests_js" ] |
| + } |
| + |
| data += [ |
| "$root_out_dir/test_data/chrome/browser/resources/print_preview/", |
| "$root_out_dir/test_data/chrome/renderer/resources/extensions/", |