diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 00:14:16 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 00:14:16 +0000 |
| commit | 6fa21d04082f0ec4416be6095d6cc12011cc4050 (patch) | |
| tree | 19ddd5097b1dd82d95af005c6b1df58dc398d60b /ipc/ipc_channel_posix_unittest.cc | |
| parent | 79baf79fe19ffd5103e43f1bd8cda7060ac63016 (diff) | |
| download | chromium_src-6fa21d04082f0ec4416be6095d6cc12011cc4050.zip chromium_src-6fa21d04082f0ec4416be6095d6cc12011cc4050.tar.gz chromium_src-6fa21d04082f0ec4416be6095d6cc12011cc4050.tar.bz2 | |
Android IPC changes.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8437033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel_posix_unittest.cc')
| -rw-r--r-- | ipc/ipc_channel_posix_unittest.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc index 6f37ae6..61c21d3 100644 --- a/ipc/ipc_channel_posix_unittest.cc +++ b/ipc/ipc_channel_posix_unittest.cc @@ -107,8 +107,13 @@ private: scoped_ptr<MessageLoopForIO> message_loop_; }; +#if defined(OS_ANDROID) +const char IPCChannelPosixTest::kConnectionSocketTestName[] = + "/data/local/chrome_IPCChannelPosixTest__ConnectionSocket"; +#else const char IPCChannelPosixTest::kConnectionSocketTestName[] = "/var/tmp/chrome_IPCChannelPosixTest__ConnectionSocket"; +#endif void IPCChannelPosixTest::SetUp() { MultiProcessTest::SetUp(); @@ -177,8 +182,14 @@ void IPCChannelPosixTest::SpinRunLoop(int milliseconds) { } TEST_F(IPCChannelPosixTest, BasicListen) { + +#if defined(OS_ANDROID) + const char* kChannelName = "/data/local/IPCChannelPosixTest_BasicListen"; +#else + const char* kChannelName = "/var/tmp/IPCChannelPosixTest_BasicListen"; +#endif // Test creating a socket that is listening. - IPC::ChannelHandle handle("/var/tmp/IPCChannelPosixTest_BasicListen"); + IPC::ChannelHandle handle(kChannelName); SetUpSocket(&handle, IPC::Channel::MODE_NAMED_SERVER); unlink(handle.name.c_str()); IPC::Channel channel(handle, IPC::Channel::MODE_NAMED_SERVER, NULL); @@ -404,4 +415,3 @@ MULTIPROCESS_TEST_MAIN(IPCChannelPosixFailConnectionProc) { } return 0; } - |