Skip to content

Commit

Permalink
Disable AshWindowTreeHostX11Test.DispatchTouchEventToOneRootWindow on…
Browse files Browse the repository at this point in the history
… ChromeOS.

BUG=499997
TBR=shuchen

Review URL: https://codereview.chromium.org/1173363014.

Cr-Commit-Position: refs/heads/master@{#334249}
  • Loading branch information
skobes-chromium committed Jun 12, 2015
1 parent 8a18e20 commit 59cd0e3
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion ash/host/ash_window_tree_host_x11_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,17 @@ class AshWindowTreeHostX11Test : public aura::test::AuraTestBase {
}
};

// Fails on ChromeOS valgrind bot. http://crbug.com/499997
#if defined(OS_CHROMEOS)
#define MAYBE_DispatchTouchEventToOneRootWindow DISABLED_DispatchTouchEventToOneRootWindow
#else
#define MAYBE_DispatchTouchEventToOneRootWindow DispatchTouchEventToOneRootWindow
#endif

// Send X touch events to one WindowTreeHost. The WindowTreeHost's
// delegate will get corresponding ui::TouchEvent if the touch events
// are targeting this WindowTreeHost.
TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) {
TEST_F(AshWindowTreeHostX11Test, MAYBE_DispatchTouchEventToOneRootWindow) {
scoped_ptr<aura::WindowTreeHostX11> window_tree_host(
new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700)));
window_tree_host->InitHost();
Expand Down

0 comments on commit 59cd0e3

Please sign in to comment.