Commit 839b4cc9 authored by A Olsen's avatar A Olsen Committed by Commit Bot

Reland: Disable new JS test for ASAN properly

JS tests don't work on ASAN, which is a known bug:
https://crbug.com/1010561

Use the existing "include_js_tests" flag to exclude
password_change_authenticator_test as it is intended,
instead of an ad-hoc solution.

Reland: Last time I moved the wrong target into
the include_js_tests block, so it didn't work.

Bug: 1022385
Change-Id: I9eac120f3abef3c7b6856804f3894d2a2742f92d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1910220Reviewed-by: default avatarA Olsen <olsen@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: A Olsen <olsen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714872}
parent c7351898
......@@ -413,9 +413,7 @@ repack("dev_ui_paks") {
]
}
# TODO(https://crbug.com/930109): Figure out why this test fails on MAC ASAN.
if (!is_asan || !is_mac) {
js2gtest("resources_unitjs_tests") {
js2gtest("resources_unitjs_tests") {
test_type = "webui"
sources = [
"gaia_auth_host/password_change_authenticator_test.unitjs",
......@@ -431,16 +429,11 @@ if (!is_asan || !is_mac) {
"gaia_auth_host/password_change_authenticator.js",
]
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
}
}
source_set("browser_tests") {
source_set("browser_tests_js") {
testonly = true
deps = [
":resources_unitjs_tests",
]
}
} else {
source_set("browser_tests") {
testonly = true
}
}
......@@ -672,7 +672,6 @@ if (!is_android) {
"//chrome/browser/devtools:test_support",
"//chrome/browser/notifications/scheduler/test:test_support",
"//chrome/browser/profiling_host:profiling_browsertests",
"//chrome/browser/resources:browser_tests",
"//chrome/browser/web_applications:browser_tests",
"//chrome/browser/web_applications/extensions:browser_tests",
"//chrome/renderer",
......@@ -1466,6 +1465,7 @@ if (!is_android) {
if (include_js_tests) {
deps += [
"//chrome/browser/resources:browser_tests_js",
"//chrome/test/data/webui:browser_tests_js_mojo_lite_webui",
"//chrome/test/data/webui:browser_tests_js_webui",
]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment