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

Unified Diff: chrome/test/BUILD.gn

Issue 2865723002: Reland of: WebUI: Disable all JS tests in MSAN, ASAN, and TSAN bots. (Closed)
Patch Set: Address comment. Created 3 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 | chrome/test/data/webui/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index cc1bd501573f2e243821f401577d9d43d0c38456..3227b89943668ebd0abebcc8bcd8e3949b75d5ae 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 {
+ include_js_tests = !(is_asan || is_msan || is_tsan)
}
# 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 (include_js_tests) {
+ 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.
@@ -1730,7 +1735,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",
@@ -1780,6 +1784,10 @@ test("browser_tests") {
"//v8",
]
+ if (include_js_tests) {
+ deps += [ "//chrome/test/data/webui:browser_tests_js_webui" ]
+ }
+
# Runtime dependencies
data_deps += [
"//ppapi:ppapi_tests",
@@ -3663,10 +3671,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 (include_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/",
« no previous file with comments | « no previous file | chrome/test/data/webui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698