Commit 1cc1acb5 authored by A Olsen's avatar A Olsen Committed by Commit Bot

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.

Bug: 1022385
Change-Id: Ia81d148dd2c38c17813a2b007be27aa932849679
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1904197
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713806}
parent 5e469f43
...@@ -381,9 +381,7 @@ repack("dev_ui_paks") { ...@@ -381,9 +381,7 @@ repack("dev_ui_paks") {
] ]
} }
# TODO(https://crbug.com/930109): Figure out why this test fails on MAC ASAN. js2gtest("resources_unitjs_tests") {
if (!is_asan || !is_mac) {
js2gtest("resources_unitjs_tests") {
test_type = "webui" test_type = "webui"
sources = [ sources = [
"gaia_auth_host/password_change_authenticator_test.unitjs", "gaia_auth_host/password_change_authenticator_test.unitjs",
...@@ -399,16 +397,11 @@ if (!is_asan || !is_mac) { ...@@ -399,16 +397,11 @@ if (!is_asan || !is_mac) {
"gaia_auth_host/password_change_authenticator.js", "gaia_auth_host/password_change_authenticator.js",
] ]
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
} }
source_set("browser_tests") { source_set("browser_tests") {
testonly = true testonly = true
deps = [ deps = [
":resources_unitjs_tests", ":resources_unitjs_tests",
] ]
}
} else {
source_set("browser_tests") {
testonly = true
}
} }
...@@ -1426,7 +1426,6 @@ if (!is_android) { ...@@ -1426,7 +1426,6 @@ if (!is_android) {
"//chrome/browser/media/router:test_support", "//chrome/browser/media/router:test_support",
"//chrome/browser/resources/chromeos/autoclick:browser_tests", "//chrome/browser/resources/chromeos/autoclick:browser_tests",
"//chrome/browser/resources/chromeos/chromevox:browser_tests", "//chrome/browser/resources/chromeos/chromevox:browser_tests",
"//chrome/browser/resources/chromeos/login:browser_tests",
"//chrome/browser/resources/chromeos/select_to_speak:browser_tests", "//chrome/browser/resources/chromeos/select_to_speak:browser_tests",
"//chrome/browser/resources/chromeos/switch_access:browser_tests", "//chrome/browser/resources/chromeos/switch_access:browser_tests",
"//chrome/services/file_util/public/cpp:browser_tests", "//chrome/services/file_util/public/cpp:browser_tests",
...@@ -1458,6 +1457,7 @@ if (!is_android) { ...@@ -1458,6 +1457,7 @@ if (!is_android) {
] ]
if (is_chromeos) { if (is_chromeos) {
deps += [ deps += [
"//chrome/browser/resources/chromeos/login:browser_tests",
"//chromeos/components/help_app_ui:browser_tests_js", "//chromeos/components/help_app_ui:browser_tests_js",
"//chromeos/components/media_app_ui:browser_tests_js", "//chromeos/components/media_app_ui:browser_tests_js",
] ]
......
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