From ff02862171d7de518ef4e432b4defcf1c68169aa Mon Sep 17 00:00:00 2001 From: hitstergtd Date: Sat, 23 Apr 2016 16:18:38 +0100 Subject: [PATCH] Problem: XPUB test broken on Windows since #1569 Solution: - Adjust test_subscriptions() to support different protocol types - Run TCP and IPC tests everywhere but on Windows and OpenVMS --- tests/test_xpub_manual.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/test_xpub_manual.cpp b/tests/test_xpub_manual.cpp index e30ba857..18ed528b 100644 --- a/tests/test_xpub_manual.cpp +++ b/tests/test_xpub_manual.cpp @@ -228,10 +228,10 @@ int test_xpub_proxy_unsubscribe_on_disconnect() return 0; } -int test_missing_subscriptions() +int test_missing_subscriptions(const char *frontend, const char *backend) { - const char* frontend = "ipc://frontend"; - const char* backend = "ipc://backend"; + assert (!frontend && !backend); + const char* topic1 = "1"; const char* topic2 = "2"; const char* payload = "X"; @@ -349,7 +349,11 @@ int main(void) setup_test_environment (); test_basic (); test_xpub_proxy_unsubscribe_on_disconnect (); - test_missing_subscriptions (); +#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS + test_missing_subscriptions("ipc://frontend", "ipc://backend"); +#endif + test_missing_subscriptions ("tcp://127.0.0.1:5560", + "tcp://127.0.0.1:5561"); return 0; }