Merge branch 'master' of github.com:sebastien/libzmq

tests/Makefile.am

@@ -89,4 +89,5 @@ noinst_PROGRAMS += test_raw_sock
 test_raw_sock_SOURCES = test_raw_sock.cpp
 
 #  Run the test cases
-TESTS = $(noinst_PROGRAMS)
\ No newline at end of file
+TESTS = $(noinst_PROGRAMS)
+XFAIL_TESTS = test_linger

tests/test_linger.cpp

@@ -81,9 +81,6 @@ int main (void)
     //  returning a "resource unavailable" or an assertion failure in
     //  poller_base.cpp:31.
     size_t size = 4000000;
-
-    //  TODO: Allow make check to pass, until this issue is resolved
-    size = 40000;
     
     //  Start the sender thread and get message
     void *send_thread = zmq_threadstart (&sender, (void *) &size);