Commit cb3102cf authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

chromeos: enable a couple of tests on memory sanitizers

These now pass because of adding kOverrideUseSoftwareGLForTests in
AshTestSuite.

BUG=838520, 725095
TEST=test only changes

Change-Id: I070d5749486338e2fd72815b4dd75d13a391204f
Reviewed-on: https://chromium-review.googlesource.com/1169535
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581921}
parent 63e6d375
...@@ -35,16 +35,7 @@ class AppLaunchTest : public service_manager::test::ServiceTest { ...@@ -35,16 +35,7 @@ class AppLaunchTest : public service_manager::test::ServiceTest {
DISALLOW_COPY_AND_ASSIGN(AppLaunchTest); DISALLOW_COPY_AND_ASSIGN(AppLaunchTest);
}; };
#if defined(ADDRESS_SANITIZER) TEST_F(AppLaunchTest, TestQuickLaunch) {
// TODO: fix. See https://crbug.com/838520
#define MAYBE_TestQuickLaunch DISABLED_TestQuickLaunch
#elif defined(MEMORY_SANITIZER)
// TODO: fix. See https://crbug.com/725095
#define MAYBE_TestQuickLaunch DISABLED_TestQuickLaunch
#else
#define MAYBE_TestQuickLaunch TestQuickLaunch
#endif
TEST_F(AppLaunchTest, MAYBE_TestQuickLaunch) {
connector()->StartService(mojom::kServiceName); connector()->StartService(mojom::kServiceName);
connector()->StartService(quick_launch::mojom::kServiceName); connector()->StartService(quick_launch::mojom::kServiceName);
......
...@@ -91,16 +91,7 @@ void OnEmbed(bool success) { ...@@ -91,16 +91,7 @@ void OnEmbed(bool success) {
ASSERT_TRUE(success); ASSERT_TRUE(success);
} }
#if defined(ADDRESS_SANITIZER) TEST_F(AshServiceTest, OpenWindow) {
// TODO: fix. See https://crbug.com/838520
#define MAYBE_OpenWindow DISABLED_OpenWindow
#elif defined(MEMORY_SANITIZER)
// TODO: fix. See https://crbug.com/725095
#define MAYBE_OpenWindow DISABLED_OpenWindow
#else
#define MAYBE_OpenWindow OpenWindow
#endif
TEST_F(AshServiceTest, MAYBE_OpenWindow) {
display::ScreenBase screen; display::ScreenBase screen;
screen.display_list().AddDisplay( screen.display_list().AddDisplay(
display::Display(1, gfx::Rect(0, 0, 200, 200)), display::Display(1, gfx::Rect(0, 0, 200, 200)),
......
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