summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-16 21:49:34 +0000
committerjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-16 21:49:34 +0000
commit3af21263f5661bf5387aaa526623e734cb383fab (patch)
treeb0f4a6dd14d480049fdca8bbf3b5649e45242d3c /chrome/common
parentd8a447c5f7eef2dfe00a2a80466288be0d7329f7 (diff)
downloadchromium_src-3af21263f5661bf5387aaa526623e734cb383fab.zip
chromium_src-3af21263f5661bf5387aaa526623e734cb383fab.tar.gz
chromium_src-3af21263f5661bf5387aaa526623e734cb383fab.tar.bz2
* Fix for one end of FIFO not being set as non-blocking. This fixes the IPC fuzzing tests on Linux.
* Enable fuzzing tests on Linux. Review URL: http://codereview.chromium.org/14484 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/ipc_channel_posix.cc4
-rw-r--r--chrome/common/ipc_tests.scons4
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/common/ipc_channel_posix.cc b/chrome/common/ipc_channel_posix.cc
index f2591f6..2cdbca4 100644
--- a/chrome/common/ipc_channel_posix.cc
+++ b/chrome/common/ipc_channel_posix.cc
@@ -98,6 +98,10 @@ bool ServerAcceptFifoConnection(int server_listen_fd, int* server_socket) {
int accept_fd = accept(server_listen_fd, NULL, 0);
if (accept_fd < 0)
return false;
+ if (fcntl(accept_fd, F_SETFL, O_NONBLOCK) == -1) {
+ close(accept_fd);
+ return false;
+ }
*server_socket = accept_fd;
return true;
diff --git a/chrome/common/ipc_tests.scons b/chrome/common/ipc_tests.scons
index 48b098e..d4d534d 100644
--- a/chrome/common/ipc_tests.scons
+++ b/chrome/common/ipc_tests.scons
@@ -81,10 +81,6 @@ input_files = [
'$BASE_DIR/perftimer$OBJSUFFIX',
]
-if env['PLATFORM'] == 'posix':
- # TODO(port): These tests don't work yet.
- input_files.remove('ipc_fuzzing_tests.cc')
-
ipc_tests = env.ChromeTestProgram('ipc_tests', input_files)
i = env.Install('$TARGET_ROOT', ipc_tests)
Alias('chrome', i)