Chromium Code Reviews| Index: mojo/edk/system/message_pipe_perftest.cc |
| diff --git a/mojo/edk/system/message_pipe_perftest.cc b/mojo/edk/system/message_pipe_perftest.cc |
| index 9f1ac5d2ed04049025da2179a06539d9e067c2c2..23877823d326d103ac0e6cbcb7c933d046c38448 100644 |
| --- a/mojo/edk/system/message_pipe_perftest.cc |
| +++ b/mojo/edk/system/message_pipe_perftest.cc |
| @@ -140,7 +140,13 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(PingPongClient) { |
| // Repeatedly sends messages as previous one got replied by the child. |
| // Waits for the child to close its end before quitting once specified |
| // number of messages has been sent. |
| -TEST_F(MultiprocessMessagePipePerfTest, PingPong) { |
| +#if defined(OS_ANDROID) |
| +// Android multi-process tests are not executing the new process. This is flaky. |
|
viettrungluu
2014/11/25 16:45:09
"
|
| +#define MAYBE_PingPong DISABLED_PingPong |
| +#else |
| +#define MAYBE_PingPong PingPong |
| +#endif // defined(OS_ANDROID) |
| +TEST_F(MultiprocessMessagePipePerfTest, MAYBE_PingPong) { |
| helper()->StartChild("PingPongClient"); |
| scoped_refptr<ChannelEndpoint> ep; |