Commit 7048c237 authored by Henrik Grunell's avatar Henrik Grunell Committed by Commit Bot

Disable flaky PointerTest on Linux ChromiumOS ASan Lsan.

TBR=reveman@chromium.org

Bug: 859020
Change-Id: I0fa9cfa276acf2f39e3e635cf5d0023a6b4986a2
Reviewed-on: https://chromium-review.googlesource.com/1120172Reviewed-by: default avatarHenrik Grunell <grunell@chromium.org>
Commit-Queue: Henrik Grunell <grunell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571446}
parent 42418b4b
...@@ -44,9 +44,15 @@ class MockPointerDelegate : public PointerDelegate { ...@@ -44,9 +44,15 @@ class MockPointerDelegate : public PointerDelegate {
MOCK_METHOD0(OnPointerFrame, void()); MOCK_METHOD0(OnPointerFrame, void());
}; };
class PointerTest : public test::ExoTestBase { // Flaky on Linux Chromium OS ASan LSan. http://crbug.com/859020.
#if defined(OS_CHROMEOS) && defined(ADDRESS_SANITIZER)
#define MAYBE_PointerTest DISABLED_PointerTest
#else
#define MAYBE_PointerTest PointerTest
#endif
class MAYBE_PointerTest : public test::ExoTestBase {
public: public:
PointerTest() = default; MAYBE_PointerTest() = default;
void SetUp() override { void SetUp() override {
test::ExoTestBase::SetUp(); test::ExoTestBase::SetUp();
...@@ -57,10 +63,10 @@ class PointerTest : public test::ExoTestBase { ...@@ -57,10 +63,10 @@ class PointerTest : public test::ExoTestBase {
} }
private: private:
DISALLOW_COPY_AND_ASSIGN(PointerTest); DISALLOW_COPY_AND_ASSIGN(MAYBE_PointerTest);
}; };
TEST_F(PointerTest, SetCursor) { TEST_F(MAYBE_PointerTest, SetCursor) {
std::unique_ptr<Surface> surface(new Surface); std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get())); std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
gfx::Size buffer_size(10, 10); gfx::Size buffer_size(10, 10);
...@@ -128,7 +134,7 @@ TEST_F(PointerTest, SetCursor) { ...@@ -128,7 +134,7 @@ TEST_F(PointerTest, SetCursor) {
pointer.reset(); pointer.reset();
} }
TEST_F(PointerTest, SetCursorNull) { TEST_F(MAYBE_PointerTest, SetCursorNull) {
std::unique_ptr<Surface> surface(new Surface); std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get())); std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
gfx::Size buffer_size(10, 10); gfx::Size buffer_size(10, 10);
...@@ -159,7 +165,7 @@ TEST_F(PointerTest, SetCursorNull) { ...@@ -159,7 +165,7 @@ TEST_F(PointerTest, SetCursorNull) {
pointer.reset(); pointer.reset();
} }
TEST_F(PointerTest, SetCursorType) { TEST_F(MAYBE_PointerTest, SetCursorType) {
std::unique_ptr<Surface> surface(new Surface); std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get())); std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
gfx::Size buffer_size(10, 10); gfx::Size buffer_size(10, 10);
...@@ -220,7 +226,7 @@ TEST_F(PointerTest, SetCursorType) { ...@@ -220,7 +226,7 @@ TEST_F(PointerTest, SetCursorType) {
pointer.reset(); pointer.reset();
} }
TEST_F(PointerTest, SetCursorAndSetCursorType) { TEST_F(MAYBE_PointerTest, SetCursorAndSetCursorType) {
std::unique_ptr<Surface> surface(new Surface); std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get())); std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
gfx::Size buffer_size(10, 10); gfx::Size buffer_size(10, 10);
...@@ -288,7 +294,7 @@ TEST_F(PointerTest, SetCursorAndSetCursorType) { ...@@ -288,7 +294,7 @@ TEST_F(PointerTest, SetCursorAndSetCursorType) {
pointer.reset(); pointer.reset();
} }
TEST_F(PointerTest, SetCursorNullAndSetCursorType) { TEST_F(MAYBE_PointerTest, SetCursorNullAndSetCursorType) {
std::unique_ptr<Surface> surface(new Surface); std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get())); std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
gfx::Size buffer_size(10, 10); gfx::Size buffer_size(10, 10);
...@@ -332,7 +338,7 @@ TEST_F(PointerTest, SetCursorNullAndSetCursorType) { ...@@ -332,7 +338,7 @@ TEST_F(PointerTest, SetCursorNullAndSetCursorType) {
pointer.reset(); pointer.reset();
} }
TEST_F(PointerTest, OnPointerEnter) { TEST_F(MAYBE_PointerTest, OnPointerEnter) {
std::unique_ptr<Surface> surface(new Surface); std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get())); std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
gfx::Size buffer_size(10, 10); gfx::Size buffer_size(10, 10);
...@@ -355,7 +361,7 @@ TEST_F(PointerTest, OnPointerEnter) { ...@@ -355,7 +361,7 @@ TEST_F(PointerTest, OnPointerEnter) {
pointer.reset(); pointer.reset();
} }
TEST_F(PointerTest, OnPointerLeave) { TEST_F(MAYBE_PointerTest, OnPointerLeave) {
std::unique_ptr<Surface> surface(new Surface); std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get())); std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
gfx::Size buffer_size(10, 10); gfx::Size buffer_size(10, 10);
...@@ -388,7 +394,7 @@ TEST_F(PointerTest, OnPointerLeave) { ...@@ -388,7 +394,7 @@ TEST_F(PointerTest, OnPointerLeave) {
pointer.reset(); pointer.reset();
} }
TEST_F(PointerTest, OnPointerMotion) { TEST_F(MAYBE_PointerTest, OnPointerMotion) {
std::unique_ptr<Surface> surface(new Surface); std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get())); std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
gfx::Size buffer_size(10, 10); gfx::Size buffer_size(10, 10);
...@@ -461,7 +467,7 @@ TEST_F(PointerTest, OnPointerMotion) { ...@@ -461,7 +467,7 @@ TEST_F(PointerTest, OnPointerMotion) {
pointer.reset(); pointer.reset();
} }
TEST_F(PointerTest, OnPointerButton) { TEST_F(MAYBE_PointerTest, OnPointerButton) {
std::unique_ptr<Surface> surface(new Surface); std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get())); std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
gfx::Size buffer_size(10, 10); gfx::Size buffer_size(10, 10);
...@@ -491,7 +497,7 @@ TEST_F(PointerTest, OnPointerButton) { ...@@ -491,7 +497,7 @@ TEST_F(PointerTest, OnPointerButton) {
pointer.reset(); pointer.reset();
} }
TEST_F(PointerTest, OnPointerScroll) { TEST_F(MAYBE_PointerTest, OnPointerScroll) {
std::unique_ptr<Surface> surface(new Surface); std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get())); std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
gfx::Size buffer_size(10, 10); gfx::Size buffer_size(10, 10);
...@@ -526,7 +532,7 @@ TEST_F(PointerTest, OnPointerScroll) { ...@@ -526,7 +532,7 @@ TEST_F(PointerTest, OnPointerScroll) {
pointer.reset(); pointer.reset();
} }
TEST_F(PointerTest, OnPointerScrollDiscrete) { TEST_F(MAYBE_PointerTest, OnPointerScrollDiscrete) {
std::unique_ptr<Surface> surface(new Surface); std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get())); std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
gfx::Size buffer_size(10, 10); gfx::Size buffer_size(10, 10);
...@@ -554,7 +560,7 @@ TEST_F(PointerTest, OnPointerScrollDiscrete) { ...@@ -554,7 +560,7 @@ TEST_F(PointerTest, OnPointerScrollDiscrete) {
pointer.reset(); pointer.reset();
} }
TEST_F(PointerTest, IgnorePointerEventDuringModal) { TEST_F(MAYBE_PointerTest, IgnorePointerEventDuringModal) {
std::unique_ptr<Surface> surface(new Surface); std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get())); std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
std::unique_ptr<Buffer> buffer( std::unique_ptr<Buffer> buffer(
......
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