Merge pull request #3706 from somdoron/master

WIP: problem: appveyor is failing

.gitignore

@@ -154,6 +154,8 @@ test_mock_pub_sub
 test_proxy_hwm
 test_ws_transport
 test_wss_transport
+test_socks
+test_xpub_manual_last_value
 unittest_ip_resolver
 unittest_mtrie
 unittest_poller
@@ -202,3 +204,5 @@ zeromq-*.zip
 core
 build
 test-suite.log
+.idea/
+cmake-build-debug/
\ No newline at end of file

appveyor.yml

@@ -220,7 +220,7 @@ after_build:
   - cmd: cd %LIBZMQ_BUILDDIR%\bin\%Configuration%"
   - cmd: if "%WITH_LIBSODIUM%"=="ON" copy "%SODIUM_LIBRARY_DIR%\libsodium.dll" .
   - cmd: copy "%LIBZMQ_SRCDIR%\include\zmq.h" .
-  - cmd: copy ..\..\lib\%Configuration%\libzmq*.lib .
+  - cmd: copy ..\..\lib\%Configuration%\libzmq*.lib . & exit 0
   - cmd: 7z a -y -bd -mx=9 libzmq.zip *.exe *.dll *.pdb *.h *.lib
   - ps: Push-AppveyorArtifact "libzmq.zip" -Filename "libzmq-${env:ARTIFACT_NAME}-${env:ZMQ_VERSION_MAJOR}_${env:ZMQ_VERSION_MINOR}_${env:ZMQ_VERSION_PATCH}.zip"
 

tests/test_xpub_nodrop.cpp

@@ -101,8 +101,15 @@ void test ()
         send_count++;
     TEST_ASSERT_EQUAL_INT (EAGAIN, errno);
 
-    while (zmq_recv (sub, NULL, 0, ZMQ_DONTWAIT) == 0)
+    if (send_count > 0) {
+        //  Receive first message with blocking
+        TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (sub, NULL, 0, 0));
         recv_count++;
+
+        while (zmq_recv (sub, NULL, 0, ZMQ_DONTWAIT) == 0)
+            recv_count++;
+    }
+
     TEST_ASSERT_EQUAL_INT (send_count, recv_count);
 
     //  Clean up.