From dcbf5fac655c77a319577e6ce6072d70445718d9 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 16 Sep 2008 10:26:26 +0200 Subject: [PATCH] allow non-blocking connect to succeed, as it does on OpenBSD 2008-09-16 Paolo Bonzini * tests/test-poll.c (connect_to_socket): Allow non-blocking connect to succeed. --- ChangeLog | 5 +++++ tests/test-poll.c | 12 ++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41b8c5d278..32e7ed9f8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Paolo Bonzini + + * tests/test-poll.c (connect_to_socket): Allow non-blocking connect + to succeed. + 2008-09-16 Jim Meyering avoid spurious test failure when library is built without ACL support diff --git a/tests/test-poll.c b/tests/test-poll.c index 5e8d70614f..f97b8d5237 100644 --- a/tests/test-poll.c +++ b/tests/test-poll.c @@ -139,16 +139,12 @@ connect_to_socket (int blocking) #endif } - if (connect (s, (struct sockaddr *) &ia, sizeof (ia)) < 0) + if (connect (s, (struct sockaddr *) &ia, sizeof (ia)) < 0 + && (blocking || errno != EINPROGRESS)) { - if (errno != EINPROGRESS) - { - perror ("connect"); - exit (77); - } + perror ("connect"); + exit (77); } - else if (!blocking) - failed ("huh, connect succeeded?"); return s; } -- 2.30.2