Commit 9579ce89 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Disable CrElementsDrawerTest.All on Linux CFI.

The test sporadically fails on the bot. Also rename the test name from
"All" to "Drawer" to avoid potential confusion with other tests.

Bug: 1013656
Change-Id: Ie6314b8c039f7e58796ad36a7f930729ffdb31f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1856721
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705252}
parent af158bd6
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import("//build/config/sanitizers/sanitizers.gni")
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
import("//chrome/test/base/js2gtest.gni") import("//chrome/test/base/js2gtest.gni")
import("//ui/webui/resources/tools/js_modulizer.gni") import("//ui/webui/resources/tools/js_modulizer.gni")
...@@ -192,6 +193,11 @@ js2gtest("browser_tests_js_webui") { ...@@ -192,6 +193,11 @@ js2gtest("browser_tests_js_webui") {
"$root_gen_dir/chrome/test/data/webui/test_util.m.js", "$root_gen_dir/chrome/test/data/webui/test_util.m.js",
] ]
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
# https://crbug.com/1013656
if (is_cfi) {
defines += [ "IS_CFI" ]
}
} }
js2gtest("browser_tests_js_mojo_lite_webui") { js2gtest("browser_tests_js_mojo_lite_webui") {
......
...@@ -155,7 +155,14 @@ CrElementsDrawerTest.prototype = { ...@@ -155,7 +155,14 @@ CrElementsDrawerTest.prototype = {
]), ]),
}; };
TEST_F('CrElementsDrawerTest', 'All', function() { // https://crbug.com/1013656 - Flaky on Linux CFI.
GEN('#if defined(OS_LINUX) && defined(IS_CFI)');
GEN('#define MAYBE_Drawer DISABLED_Drawer');
GEN('#else');
GEN('#define MAYBE_Drawer Drawer');
GEN('#endif');
TEST_F('CrElementsDrawerTest', 'MAYBE_Drawer', function() {
mocha.run(); mocha.run();
}); });
......
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