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

Unified Diff: ipc/ipc_channel_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_channel_proxy_unittest.cc ('k') | ipc/ipc_fuzzing_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_channel_unittest.cc
diff --git a/ipc/ipc_channel_unittest.cc b/ipc/ipc_channel_unittest.cc
index 588426d758231b8e10669c0497580c7da9fb3dda..3127af7f6fbd3c3d47b1727e962c7ffdbfc141fc 100644
--- a/ipc/ipc_channel_unittest.cc
+++ b/ipc/ipc_channel_unittest.cc
@@ -22,7 +22,12 @@ namespace {
class IPCChannelTest : public IPCTestBase {
};
-TEST_F(IPCChannelTest, ChannelTest) {
+#if defined(OS_ANDROID)
+#define MAYBE_ChannelTest DISABLED_ChannelTest
+#else
+#define MAYBE_ChannelTest ChannelTest
+#endif
+TEST_F(IPCChannelTest, MAYBE_ChannelTest) {
Init("GenericClient");
// Set up IPC channel and start client.
@@ -84,7 +89,12 @@ TEST_F(IPCChannelTest, ChannelTestExistingPipe) {
}
#endif // defined (OS_WIN)
-TEST_F(IPCChannelTest, ChannelProxyTest) {
+#if defined(OS_ANDROID)
+#define MAYBE_ChannelProxyTest DISABLED_ChannelProxyTest
+#else
+#define MAYBE_ChannelProxyTest ChannelProxyTest
+#endif
+TEST_F(IPCChannelTest, MAYBE_ChannelProxyTest) {
Init("GenericClient");
base::Thread thread("ChannelProxyTestServer");
@@ -121,7 +131,7 @@ class ChannelListenerWithOnConnectedSend : public IPC::TestChannelListener {
}
};
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_ANDROID)
// Acting flakey in Windows. http://crbug.com/129595
#define MAYBE_SendMessageInChannelConnected DISABLED_SendMessageInChannelConnected
#else
« no previous file with comments | « ipc/ipc_channel_proxy_unittest.cc ('k') | ipc/ipc_fuzzing_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698