Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Unified Diff: ipc/sync_socket_unittest.cc

Issue 1259823002: Remove Android filter file for ipc_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remaining tests Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ipc/ipc_sync_channel_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/sync_socket_unittest.cc
diff --git a/ipc/sync_socket_unittest.cc b/ipc/sync_socket_unittest.cc
index 0172c2f298266feb8124ce4a79504225e2bed8eb..edda3c48508bf8c625750f279abce80df0f85c79 100644
--- a/ipc/sync_socket_unittest.cc
+++ b/ipc/sync_socket_unittest.cc
@@ -166,7 +166,12 @@ class SyncSocketClientListener : public IPC::Listener {
class SyncSocketTest : public IPCTestBase {
};
-TEST_F(SyncSocketTest, SanityTest) {
+#if defined(OS_ANDROID)
+#define MAYBE_SanityTest DISABLED_SanityTest
+#else
+#define MAYBE_SanityTest SanityTest
+#endif
+TEST_F(SyncSocketTest, MAYBE_SanityTest) {
Init("SyncSocketServerClient");
SyncSocketClientListener listener;
@@ -248,8 +253,13 @@ TEST_F(SyncSocketTest, DisconnectTest) {
EXPECT_EQ(0U, received);
}
+#if defined(OS_ANDROID)
+#define MAYBE_BlockingReceiveTest DISABLED_BlockingReceiveTest
+#else
+#define MAYBE_BlockingReceiveTest BlockingReceiveTest
+#endif
// Tests that read is a blocking operation.
-TEST_F(SyncSocketTest, BlockingReceiveTest) {
+TEST_F(SyncSocketTest, MAYBE_BlockingReceiveTest) {
base::CancelableSyncSocket pair[2];
ASSERT_TRUE(base::CancelableSyncSocket::CreatePair(&pair[0], &pair[1]));
« no previous file with comments | « ipc/ipc_sync_channel_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698