Index: ipc/ipc_fuzzing_tests.cc |
diff --git a/ipc/ipc_fuzzing_tests.cc b/ipc/ipc_fuzzing_tests.cc |
index d3ff1a0103ac4602b1c5d8f65791606ec1a8ea7d..5dfddbac2be3d335dc205e474c82105dc235d08c 100644 |
--- a/ipc/ipc_fuzzing_tests.cc |
+++ b/ipc/ipc_fuzzing_tests.cc |
@@ -88,7 +88,12 @@ TEST(IPCMessageIntegrity, ReadVectorNegativeSize) { |
EXPECT_FALSE(ReadParam(&m, &iter, &vec)); |
} |
-TEST(IPCMessageIntegrity, ReadVectorTooLarge1) { |
+#if defined(OS_ANDROID) |
+#define MAYBE_ReadVectorTooLarge1 DISABLED_ReadVectorTooLarge1 |
+#else |
+#define MAYBE_ReadVectorTooLarge1 ReadVectorTooLarge1 |
+#endif |
+TEST(IPCMessageIntegrity, MAYBE_ReadVectorTooLarge1) { |
// This was BUG 1006367. This is the large but positive length case. Again |
// we try to hit the non-specialized case vector<P>. |
IPC::Message m(0, 1, IPC::Message::PRIORITY_NORMAL); |
@@ -261,9 +266,14 @@ MULTIPROCESS_IPC_TEST_CLIENT_MAIN(FuzzServerClient) { |
class IPCFuzzingTest : public IPCTestBase { |
}; |
+#if defined(OS_ANDROID) |
+#define MAYBE_SanityTest DISABLED_SanityTest |
+#else |
+#define MAYBE_SanityTest SanityTest |
+#endif |
// This test makes sure that the FuzzerClientListener and FuzzerServerListener |
// are working properly by generating two well formed IPC calls. |
-TEST_F(IPCFuzzingTest, SanityTest) { |
+TEST_F(IPCFuzzingTest, MAYBE_SanityTest) { |
Init("FuzzServerClient"); |
FuzzerClientListener listener; |
@@ -286,12 +296,17 @@ TEST_F(IPCFuzzingTest, SanityTest) { |
DestroyChannel(); |
} |
+#if defined(OS_ANDROID) |
+#define MAYBE_MsgBadPayloadShort DISABLED_MsgBadPayloadShort |
+#else |
+#define MAYBE_MsgBadPayloadShort MsgBadPayloadShort |
+#endif |
// This test uses a payload that is smaller than expected. This generates an |
// error while unpacking the IPC buffer which in debug trigger an assertion and |
// in release is ignored (!). Right after we generate another valid IPC to make |
// sure framing is working properly. |
#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) |
-TEST_F(IPCFuzzingTest, MsgBadPayloadShort) { |
+TEST_F(IPCFuzzingTest, MAYBE_MsgBadPayloadShort) { |
Init("FuzzServerClient"); |
FuzzerClientListener listener; |
@@ -315,11 +330,16 @@ TEST_F(IPCFuzzingTest, MsgBadPayloadShort) { |
} |
#endif |
+#if defined(OS_ANDROID) |
+#define MAYBE_MsgBadPayloadArgs DISABLED_MsgBadPayloadArgs |
+#else |
+#define MAYBE_MsgBadPayloadArgs MsgBadPayloadArgs |
+#endif |
// This test uses a payload that has too many arguments, but so the payload size |
// is big enough so the unpacking routine does not generate an error as in the |
// case of MsgBadPayloadShort test. This test does not pinpoint a flaw (per se) |
// as by design we don't carry type information on the IPC message. |
-TEST_F(IPCFuzzingTest, MsgBadPayloadArgs) { |
+TEST_F(IPCFuzzingTest, MAYBE_MsgBadPayloadArgs) { |
Init("FuzzServerClient"); |
FuzzerClientListener listener; |