Commit 5d360810 authored by Michael Wasserman's avatar Michael Wasserman Committed by Commit Bot

Revert "Disable new JS test for ASAN properly"

This reverts commit 1cc1acb5.

Reason for revert: caused Mac ASan 64 Tests (1) browser_tests to fail:
PasswordChangeAuthenticatorUnitTest.DetectPingSuccess
PasswordChangeAuthenticatorUnitTest.DetectAzureSuccess
PasswordChangeAuthenticatorUnitTest.DetectAdfsSuccess
https://ci.chromium.org/p/chromium/builders/ci/Mac%20ASan%2064%20Tests%20%281%29/58281
Reverting as discussed in chat, hopefully this will make the tree a little greener?

Original change's description:
> 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: Nico Weber <thakis@chromium.org>
> Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#713806}

TBR=thakis@chromium.org,rsorokin@chromium.org,olsen@chromium.org

Change-Id: I68be33e1819fa3c705db82b7e9a49bd5e08e55b3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1022385
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1907128Reviewed-by: default avatarMichael Wasserman <msw@chromium.org>
Commit-Queue: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713927}
parent be0cc836
...@@ -409,27 +409,34 @@ repack("dev_ui_paks") { ...@@ -409,27 +409,34 @@ repack("dev_ui_paks") {
] ]
} }
js2gtest("resources_unitjs_tests") { # TODO(https://crbug.com/930109): Figure out why this test fails on MAC ASAN.
test_type = "webui" if (!is_asan || !is_mac) {
sources = [ js2gtest("resources_unitjs_tests") {
"gaia_auth_host/password_change_authenticator_test.unitjs", test_type = "webui"
] sources = [
"gaia_auth_host/password_change_authenticator_test.unitjs",
]
# This has to be a gen_include, so it doesn't collide with other js2gtests # This has to be a gen_include, so it doesn't collide with other js2gtests
gen_include_files = [ "//ui/webui/resources/js/cr.js" ] gen_include_files = [ "//ui/webui/resources/js/cr.js" ]
# But these have to be extra_js_files, since it uses a native object # But these have to be extra_js_files, since it uses a native object
# EventTarget, which doesn't work at compile time. # EventTarget, which doesn't work at compile time.
extra_js_files = [ extra_js_files = [
"//ui/webui/resources/js/cr/event_target.js", "//ui/webui/resources/js/cr/event_target.js",
"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
}
} }
...@@ -1427,6 +1427,7 @@ if (!is_android) { ...@@ -1427,6 +1427,7 @@ 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,7 +1459,6 @@ if (!is_android) { ...@@ -1458,7 +1459,6 @@ 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