summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_send_fds_test.cc
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2015-07-28 07:41:47 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-28 14:42:28 +0000
commit8514f0dcbca6d27aab452662b6339aedd592e35e (patch)
tree3e926b63b2c84b8f16bfc35c7b8cbbf3c90ee9a4 /ipc/ipc_send_fds_test.cc
parent6d06ca32c5eb4566ca16803ea135ab070f621dbb (diff)
downloadchromium_src-8514f0dcbca6d27aab452662b6339aedd592e35e.zip
chromium_src-8514f0dcbca6d27aab452662b6339aedd592e35e.tar.gz
chromium_src-8514f0dcbca6d27aab452662b6339aedd592e35e.tar.bz2
Remove Android filter file for ipc_tests.
BUG=339980 TEST=ipc_tests R=jbudorick@chromium.org,tsepez@chromium.org Review URL: https://codereview.chromium.org/1259823002 Cr-Commit-Position: refs/heads/master@{#340682}
Diffstat (limited to 'ipc/ipc_send_fds_test.cc')
-rw-r--r--ipc/ipc_send_fds_test.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/ipc/ipc_send_fds_test.cc b/ipc/ipc_send_fds_test.cc
index 7669c8f..68afb59 100644
--- a/ipc/ipc_send_fds_test.cc
+++ b/ipc/ipc_send_fds_test.cc
@@ -137,7 +137,12 @@ class IPCSendFdsTest : public IPCTestBase {
}
};
-TEST_F(IPCSendFdsTest, DescriptorTest) {
+#if defined(OS_ANDROID)
+#define MAYBE_DescriptorTest DISABLED_DescriptorTest
+#else
+#define MAYBE_DescriptorTest DescriptorTest
+#endif
+TEST_F(IPCSendFdsTest, MAYBE_DescriptorTest) {
Init("SendFdsClient");
RunServer();
}