Chromium Code Reviews| Index: sandbox/linux/syscall_broker/broker_process_unittest.cc |
| diff --git a/sandbox/linux/syscall_broker/broker_process_unittest.cc b/sandbox/linux/syscall_broker/broker_process_unittest.cc |
| index 15e1ffb62f932d06b0e8ada47cba401017c1527e..c760084ea792635c3b6a5b431faa8a86a2d60caa 100644 |
| --- a/sandbox/linux/syscall_broker/broker_process_unittest.cc |
| +++ b/sandbox/linux/syscall_broker/broker_process_unittest.cc |
| @@ -489,9 +489,16 @@ TEST(BrokerProcess, OpenComplexFlagsNoClientCheck) { |
| // expected. |
| } |
| +#if defined(OS_LINUX) |
|
mdempsky
2016/03/24 22:27:30
The entire sandbox/linux directory is OS_LINUX-spe
|
| +// Flaky on Linux NG bots: https://crbug.com/595199. |
| +#define MAYBE_RecvMsgDescriptorLeak DISABLED_RecvMsgDescriptorLeak |
| +#else |
| +#define MAYBE_RecvMsgDescriptorLeak RecvMsgDescriptorLeak |
| +#endif |
| + |
| // We need to allow noise because the broker will log when it receives our |
| // bogus IPCs. |
| -SANDBOX_TEST_ALLOW_NOISE(BrokerProcess, RecvMsgDescriptorLeak) { |
| +SANDBOX_TEST_ALLOW_NOISE(BrokerProcess, MAYBE_RecvMsgDescriptorLeak) { |
| // Android creates a socket on first use of the LOG call. |
| // We need to ensure this socket is open before we |
| // begin the test. |