allow non-blocking connect to succeed, as it does on OpenBSD

2008-09-16  Paolo Bonzini  <bonzini@gnu.org>

	* tests/test-poll.c (connect_to_socket): Allow non-blocking connect
	to succeed.

diff --git a/ChangeLog b/ChangeLog
index 41b8c5d27846f74ea199caafd9ad8efaa431359c..32e7ed9f8b15b961f95da97dd5d0a04b5e070c29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-16  Paolo Bonzini  <bonzini@gnu.org>
+
+       * tests/test-poll.c (connect_to_socket): Allow non-blocking connect
+       to succeed.
+
 2008-09-16  Jim Meyering  <meyering@redhat.com>
 
        avoid spurious test failure when library is built without ACL support

diff --git a/tests/test-poll.c b/tests/test-poll.c
index 5e8d70614feb4490df94a95e11d3237b14bea956..f97b8d5237c4751367dc34e753eac5cff3c50d57 100644 (file)
--- 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;
 }