From 8230c0d3961fac07be027c329e3c3383975f97f1 Mon Sep 17 00:00:00 2001
From: Pieter Hintjens <ph@imatix.com>
Date: Fri, 12 Feb 2016 11:31:38 +0100
Subject: [PATCH] Problem: gyp does not build tests

Solution: it's a lot of work to define the tests in project.gyp
so I did this using gsl to generate the JSON, from a small XML
list of the test cases.

To keep this, and the hundreds of .mk files, away from the root
directory, I've moved the gyp files into builds/gyp, where you
would run them.

It all seems to work now. Next up, OS/X and Windows :)
---
 CMakeLists.txt                |   2 +-
 builds/gyp/project-tests.gsl  |  19 +
 builds/gyp/project-tests.gypi | 884 ++++++++++++++++++++++++++++++++++
 builds/gyp/project-tests.xml  |  82 ++++
 builds/gyp/project.gyp        | 263 ++++++++++
 project.gyp                   | 158 ------
 tests/testutil.hpp            |   2 +-
 7 files changed, 1250 insertions(+), 160 deletions(-)
 create mode 100644 builds/gyp/project-tests.gsl
 create mode 100644 builds/gyp/project-tests.gypi
 create mode 100644 builds/gyp/project-tests.xml
 create mode 100644 builds/gyp/project.gyp
 delete mode 100644 project.gyp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93dea034..842d84f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,7 +176,7 @@ check_function_exists (gethrtime HAVE_GETHRTIME)
 set (CMAKE_REQUIRED_INCLUDES)
 
 add_definitions (-D_REENTRANT -D_THREAD_SAFE)
-add_definitions (-DZMQ_USING_CMAKE)
+add_definitions (-DZMQ_CUSTOM_PLATFORM_HPP)
 
 option (ENABLE_EVENTFD "Enable/disable eventfd" ZMQ_HAVE_EVENTFD)
 
diff --git a/builds/gyp/project-tests.gsl b/builds/gyp/project-tests.gsl
new file mode 100644
index 00000000..2d0da0de
--- /dev/null
+++ b/builds/gyp/project-tests.gsl
@@ -0,0 +1,19 @@
+.echo "Generating project-tests.gypi..."
+.output "project-tests.gypi"
+{
+  'targets': [
+.for test
+    {
+      'target_name': '$(name)',
+      'type': 'executable',
+      'sources': [
+        '../../tests/$(name).cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    }$(last ()?? ""? ",")
+.endfor
+  ]
+}
diff --git a/builds/gyp/project-tests.gypi b/builds/gyp/project-tests.gypi
new file mode 100644
index 00000000..97de7e4e
--- /dev/null
+++ b/builds/gyp/project-tests.gypi
@@ -0,0 +1,884 @@
+{
+  'targets': [
+    {
+      'target_name': 'test_system',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_system.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_pair_inproc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_pair_inproc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_pair_tcp',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_pair_tcp.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_reqrep_inproc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_reqrep_inproc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_reqrep_tcp',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_reqrep_tcp.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_hwm',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_hwm.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_hwm_pubsub',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_hwm_pubsub.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_reqrep_device',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_reqrep_device.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_sub_forward',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_sub_forward.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_invalid_rep',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_invalid_rep.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_msg_flags',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_msg_flags.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_msg_ffn',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_msg_ffn.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_large_msg',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_large_msg.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_connect_resolve',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_connect_resolve.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_immediate',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_immediate.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_last_endpoint',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_last_endpoint.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_term_endpoint',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_term_endpoint.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_srcfd',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_srcfd.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_monitor',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_monitor.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_router_mandatory',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_router_mandatory.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_router_mandatory_hwm',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_router_mandatory_hwm.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_router_handover',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_router_handover.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_probe_router',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_probe_router.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_stream',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_stream.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_stream_empty',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_stream_empty.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_stream_disconnect',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_stream_disconnect.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_stream_timeout',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_stream_timeout.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_disconnect_inproc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_disconnect_inproc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_unbind_inproc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_unbind_inproc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_unbind_wildcard',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_unbind_wildcard.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_ctx_options',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_ctx_options.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_ctx_destroy',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_ctx_destroy.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_security_null',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_security_null.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_security_plain',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_security_plain.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_security_curve',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_security_curve.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_iov',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_iov.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_spec_req',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_spec_req.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_spec_rep',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_spec_rep.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_spec_dealer',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_spec_dealer.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_spec_router',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_spec_router.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_spec_pushpull',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_spec_pushpull.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_req_correlate',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_req_correlate.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_req_relaxed',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_req_relaxed.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_conflate',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_conflate.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_inproc_connect',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_inproc_connect.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_issue_566',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_issue_566.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_proxy',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_proxy.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_proxy_single_socket',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_proxy_single_socket.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_proxy_terminate',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_proxy_terminate.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_getsockopt_memset',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_getsockopt_memset.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_setsockopt',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_setsockopt.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_many_sockets',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_many_sockets.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_ipc_wildcard',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_ipc_wildcard.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_diffserv',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_diffserv.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_connect_rid',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_connect_rid.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_bind_src_address',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_bind_src_address.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_metadata',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_metadata.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_capabilities',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_capabilities.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_xpub_nodrop',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_xpub_nodrop.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_xpub_manual',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_xpub_manual.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_xpub_welcome_msg',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_xpub_welcome_msg.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_atomics',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_atomics.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_client_server',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_client_server.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_thread_safe',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_thread_safe.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_sockopt_hwm',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_sockopt_hwm.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_heartbeats',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_heartbeats.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_stream_exceeds_buffer',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_stream_exceeds_buffer.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_poller',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_poller.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_timers',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_timers.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_radio_dish',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_radio_dish.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_udp',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_udp.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_shutdown_stress',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_shutdown_stress.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_pair_ipc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_pair_ipc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_reqrep_ipc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_reqrep_ipc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_use_fd_ipc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_use_fd_ipc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_use_fd_tcp',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_use_fd_tcp.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_timeo',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_timeo.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_filter_ipc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_filter_ipc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_fork',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_fork.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_abstract_ipc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_abstract_ipc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    }
+  ]
+}
diff --git a/builds/gyp/project-tests.xml b/builds/gyp/project-tests.xml
new file mode 100644
index 00000000..6e22c151
--- /dev/null
+++ b/builds/gyp/project-tests.xml
@@ -0,0 +1,82 @@
+<tests script = "project-tests">
+    <test name = "test_system" />
+    <test name = "test_pair_inproc" />
+    <test name = "test_pair_tcp" />
+    <test name = "test_reqrep_inproc" />
+    <test name = "test_reqrep_tcp" />
+    <test name = "test_hwm" />
+    <test name = "test_hwm_pubsub" />
+    <test name = "test_reqrep_device" />
+    <test name = "test_sub_forward" />
+    <test name = "test_invalid_rep" />
+    <test name = "test_msg_flags" />
+    <test name = "test_msg_ffn" />
+    <test name = "test_large_msg" />
+    <test name = "test_connect_resolve" />
+    <test name = "test_immediate" />
+    <test name = "test_last_endpoint" />
+    <test name = "test_term_endpoint" />
+    <test name = "test_srcfd" />
+    <test name = "test_monitor" />
+    <test name = "test_router_mandatory" />
+    <test name = "test_router_mandatory_hwm" />
+    <test name = "test_router_handover" />
+    <test name = "test_probe_router" />
+    <test name = "test_stream" />
+    <test name = "test_stream_empty" />
+    <test name = "test_stream_disconnect" />
+    <test name = "test_stream_timeout" />
+    <test name = "test_disconnect_inproc" />
+    <test name = "test_unbind_inproc" />
+    <test name = "test_unbind_wildcard" />
+    <test name = "test_ctx_options" />
+    <test name = "test_ctx_destroy" />
+    <test name = "test_security_null" />
+    <test name = "test_security_plain" />
+    <test name = "test_security_curve" />
+    <test name = "test_iov" />
+    <test name = "test_spec_req" />
+    <test name = "test_spec_rep" />
+    <test name = "test_spec_dealer" />
+    <test name = "test_spec_router" />
+    <test name = "test_spec_pushpull" />
+    <test name = "test_req_correlate" />
+    <test name = "test_req_relaxed" />
+    <test name = "test_conflate" />
+    <test name = "test_inproc_connect" />
+    <test name = "test_issue_566" />
+    <test name = "test_proxy" />
+    <test name = "test_proxy_single_socket" />
+    <test name = "test_proxy_terminate" />
+    <test name = "test_getsockopt_memset" />
+    <test name = "test_setsockopt" />
+    <test name = "test_many_sockets" />
+    <test name = "test_ipc_wildcard" />
+    <test name = "test_diffserv" />
+    <test name = "test_connect_rid" />
+    <test name = "test_bind_src_address" />
+    <test name = "test_metadata" />
+    <test name = "test_capabilities" />
+    <test name = "test_xpub_nodrop" />
+    <test name = "test_xpub_manual" />
+    <test name = "test_xpub_welcome_msg" />
+    <test name = "test_atomics" />
+    <test name = "test_client_server" />
+    <test name = "test_thread_safe" />
+    <test name = "test_sockopt_hwm" />
+    <test name = "test_heartbeats" />
+    <test name = "test_stream_exceeds_buffer" />
+    <test name = "test_poller" />
+    <test name = "test_timers" />
+    <test name = "test_radio_dish" />
+    <test name = "test_udp" />
+    <test name = "test_shutdown_stress" />
+    <test name = "test_pair_ipc" />
+    <test name = "test_reqrep_ipc" />
+    <test name = "test_use_fd_ipc" />
+    <test name = "test_use_fd_tcp" />
+    <test name = "test_timeo" />
+    <test name = "test_filter_ipc" />
+    <test name = "test_fork" />
+    <test name = "test_abstract_ipc" />
+</tests>
diff --git a/builds/gyp/project.gyp b/builds/gyp/project.gyp
new file mode 100644
index 00000000..1989ac66
--- /dev/null
+++ b/builds/gyp/project.gyp
@@ -0,0 +1,263 @@
+#
+#   This is the gyp script for libzmq
+#
+#   Run in builds/gyp, as follows:
+#
+#       gyp --depth=. --format=make
+#       make
+#
+{
+  'includes': [
+    'project-tests.gypi',
+  ],
+  'target_defaults': {
+    'include_dirs': [
+      '../../include',
+      '.'
+    ],
+    'defines': [
+      'ZMQ_CUSTOM_PLATFORM_HPP'
+    ],
+    'conditions': [
+      [ 'OS=="win"', {
+        'defines': [
+          'ZMQ_HAVE_WINDOWS=1'
+        ]
+      }],
+      [ 'OS=="mac"', {
+        'defines': [
+          'ZMQ_HAVE_OSX=1'
+        ]
+      }],
+      [ 'OS=="linux"', {
+        'defines': [
+          'ZMQ_HAVE_LINUX=1'
+        ],
+        'libraries': [
+          '-lpthread'
+        ]
+      }]
+    ]
+  },
+  'targets': [
+    {
+      'target_name': 'libzmq',
+      'type': 'static_library',
+      'sources': [
+        'platform.hpp',
+        '../../include/zmq.h',
+        '../../src/address.cpp',
+        '../../src/address.hpp',
+        '../../src/array.hpp',
+        '../../src/atomic_counter.hpp',
+        '../../src/atomic_ptr.hpp',
+        '../../src/blob.hpp',
+        '../../src/client.cpp',
+        '../../src/client.hpp',
+        '../../src/clock.cpp',
+        '../../src/clock.hpp',
+        '../../src/command.hpp',
+        '../../src/condition_variable.hpp',
+        '../../src/config.hpp',
+        '../../src/ctx.cpp',
+        '../../src/ctx.hpp',
+        '../../src/curve_client.cpp',
+        '../../src/curve_client.hpp',
+        '../../src/curve_server.cpp',
+        '../../src/curve_server.hpp',
+        '../../src/dbuffer.hpp',
+        '../../src/dealer.cpp',
+        '../../src/dealer.hpp',
+        '../../src/decoder.hpp',
+        '../../src/decoder_allocators.cpp',
+        '../../src/decoder_allocators.hpp',
+        '../../src/devpoll.cpp',
+        '../../src/devpoll.hpp',
+        '../../src/dish.cpp',
+        '../../src/dish.hpp',
+        '../../src/dist.cpp',
+        '../../src/dist.hpp',
+        '../../src/encoder.hpp',
+        '../../src/epoll.cpp',
+        '../../src/epoll.hpp',
+        '../../src/err.cpp',
+        '../../src/err.hpp',
+        '../../src/fd.hpp',
+        '../../src/fq.cpp',
+        '../../src/fq.hpp',
+        '../../src/gssapi_client.cpp',
+        '../../src/gssapi_client.hpp',
+        '../../src/gssapi_mechanism_base.cpp',
+        '../../src/gssapi_mechanism_base.hpp',
+        '../../src/gssapi_server.cpp',
+        '../../src/gssapi_server.hpp',
+        '../../src/i_decoder.hpp',
+        '../../src/i_encoder.hpp',
+        '../../src/i_engine.hpp',
+        '../../src/i_mailbox.hpp',
+        '../../src/i_poll_events.hpp',
+        '../../src/io_object.cpp',
+        '../../src/io_object.hpp',
+        '../../src/io_thread.cpp',
+        '../../src/io_thread.hpp',
+        '../../src/ip.cpp',
+        '../../src/ip.hpp',
+        '../../src/ipc_address.cpp',
+        '../../src/ipc_address.hpp',
+        '../../src/ipc_connecter.cpp',
+        '../../src/ipc_connecter.hpp',
+        '../../src/ipc_listener.cpp',
+        '../../src/ipc_listener.hpp',
+        '../../src/kqueue.cpp',
+        '../../src/kqueue.hpp',
+        '../../src/lb.cpp',
+        '../../src/lb.hpp',
+        '../../src/likely.hpp',
+        '../../src/mailbox.cpp',
+        '../../src/mailbox.hpp',
+        '../../src/mailbox_safe.cpp',
+        '../../src/mailbox_safe.hpp',
+        '../../src/mechanism.cpp',
+        '../../src/mechanism.hpp ',
+        '../../src/metadata.cpp',
+        '../../src/metadata.hpp',
+        '../../src/msg.cpp',
+        '../../src/msg.hpp',
+        '../../src/mtrie.cpp',
+        '../../src/mtrie.hpp',
+        '../../src/mutex.hpp',
+        '../../src/norm_engine.cpp',
+        '../../src/norm_engine.hpp',
+        '../../src/null_mechanism.cpp',
+        '../../src/null_mechanism.hpp',
+        '../../src/object.cpp',
+        '../../src/object.hpp',
+        '../../src/options.cpp',
+        '../../src/options.hpp',
+        '../../src/own.cpp',
+        '../../src/own.hpp',
+        '../../src/pair.cpp',
+        '../../src/pair.hpp',
+        '../../src/pgm_receiver.cpp',
+        '../../src/pgm_receiver.hpp',
+        '../../src/pgm_sender.cpp',
+        '../../src/pgm_sender.hpp',
+        '../../src/pgm_socket.cpp',
+        '../../src/pgm_socket.hpp',
+        '../../src/pipe.cpp',
+        '../../src/pipe.hpp',
+        '../../src/plain_client.cpp',
+        '../../src/plain_client.hpp',
+        '../../src/plain_server.cpp',
+        '../../src/plain_server.hpp',
+        '../../src/poll.cpp',
+        '../../src/poll.hpp',
+        '../../src/poller.hpp',
+        '../../src/poller_base.cpp',
+        '../../src/poller_base.hpp',
+        '../../src/proxy.cpp',
+        '../../src/proxy.hpp',
+        '../../src/pub.cpp',
+        '../../src/pub.hpp',
+        '../../src/pull.cpp',
+        '../../src/pull.hpp',
+        '../../src/push.cpp',
+        '../../src/push.hpp',
+        '../../src/radio.cpp',
+        '../../src/radio.hpp',
+        '../../src/random.cpp',
+        '../../src/random.hpp',
+        '../../src/raw_decoder.cpp',
+        '../../src/raw_decoder.hpp',
+        '../../src/raw_encoder.cpp',
+        '../../src/raw_encoder.hpp',
+        '../../src/reaper.cpp',
+        '../../src/reaper.hpp',
+        '../../src/rep.cpp',
+        '../../src/rep.hpp',
+        '../../src/req.cpp',
+        '../../src/req.hpp',
+        '../../src/router.cpp',
+        '../../src/router.hpp',
+        '../../src/select.cpp',
+        '../../src/select.hpp',
+        '../../src/server.cpp',
+        '../../src/server.hpp',
+        '../../src/session_base.cpp',
+        '../../src/session_base.hpp',
+        '../../src/signaler.cpp',
+        '../../src/signaler.hpp',
+        '../../src/socket_base.cpp',
+        '../../src/socket_base.hpp',
+        '../../src/socket_poller.cpp',
+        '../../src/socket_poller.hpp',
+        '../../src/socks.cpp',
+        '../../src/socks.hpp',
+        '../../src/socks_connecter.cpp',
+        '../../src/socks_connecter.hpp',
+        '../../src/stdint.hpp',
+        '../../src/stream.cpp',
+        '../../src/stream.hpp',
+        '../../src/stream_engine.cpp',
+        '../../src/stream_engine.hpp',
+        '../../src/sub.cpp',
+        '../../src/sub.hpp',
+        '../../src/tcp.cpp',
+        '../../src/tcp.hpp',
+        '../../src/tcp_address.cpp',
+        '../../src/tcp_address.hpp',
+        '../../src/tcp_connecter.cpp',
+        '../../src/tcp_connecter.hpp',
+        '../../src/tcp_listener.cpp',
+        '../../src/tcp_listener.hpp',
+        '../../src/thread.cpp',
+        '../../src/thread.hpp',
+        '../../src/timers.cpp',
+        '../../src/timers.hpp',
+        '../../src/tipc_address.cpp',
+        '../../src/tipc_address.hpp',
+        '../../src/tipc_connecter.cpp',
+        '../../src/tipc_connecter.hpp',
+        '../../src/tipc_listener.cpp',
+        '../../src/tipc_listener.hpp',
+        '../../src/trie.cpp',
+        '../../src/trie.hpp',
+        '../../src/tweetnacl.c',
+        '../../src/tweetnacl.h',
+        '../../src/udp_address.cpp',
+        '../../src/udp_address.hpp',
+        '../../src/udp_engine.cpp',
+        '../../src/udp_engine.hpp',
+        '../../src/v1_decoder.cpp',
+        '../../src/v1_decoder.hpp',
+        '../../src/v1_encoder.cpp',
+        '../../src/v1_encoder.hpp',
+        '../../src/v2_decoder.cpp',
+        '../../src/v2_decoder.hpp',
+        '../../src/v2_encoder.cpp',
+        '../../src/v2_encoder.hpp',
+        '../../src/v2_protocol.hpp',
+        '../../src/vmci.cpp',
+        '../../src/vmci.hpp',
+        '../../src/vmci_address.cpp',
+        '../../src/vmci_address.hpp',
+        '../../src/vmci_connecter.cpp',
+        '../../src/vmci_connecter.hpp',
+        '../../src/vmci_listener.cpp',
+        '../../src/vmci_listener.hpp',
+        '../../src/windows.hpp',
+        '../../src/wire.hpp',
+        '../../src/xpub.cpp',
+        '../../src/xpub.hpp',
+        '../../src/xsub.cpp',
+        '../../src/xsub.hpp',
+        '../../src/ypipe.hpp',
+        '../../src/ypipe_base.hpp',
+        '../../src/ypipe_conflate.hpp',
+        '../../src/yqueue.hpp',
+        '../../src/zmq.cpp',
+        '../../src/zmq_utils.cpp'
+      ]
+    }
+  ]
+}
diff --git a/project.gyp b/project.gyp
deleted file mode 100644
index c67955b5..00000000
--- a/project.gyp
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-#   This is the gyp script for libzmq
-#
-#   Use:
-#   gyp --depth=.
-{
-  'targets': [
-    {
-      'target_name': 'libzmq',
-      'type': 'static_library',
-      'sources': [
-        'include/zmq.h',
-        'builds/gyp/platform.hpp',
-        'src/address.cpp', 'src/address.hpp',
-        'src/array.hpp',
-        'src/atomic_counter.hpp',
-        'src/atomic_ptr.hpp',
-        'src/blob.hpp',
-        'src/client.cpp', 'src/client.hpp',
-        'src/clock.cpp', 'src/clock.hpp',
-        'src/command.hpp',
-        'src/condition_variable.hpp',
-        'src/config.hpp',
-        'src/ctx.cpp', 'src/ctx.hpp',
-        'src/curve_client.cpp', 'src/curve_client.hpp',
-        'src/curve_server.cpp', 'src/curve_server.hpp',
-        'src/dbuffer.hpp',
-        'src/dealer.cpp', 'src/dealer.hpp',
-        'src/decoder.hpp',
-        'src/devpoll.cpp', 'src/devpoll.hpp',
-        'src/dish.cpp', 'src/dish.hpp',
-        'src/dist.cpp', 'src/dist.hpp',
-        'src/encoder.hpp',
-        'src/epoll.cpp', 'src/epoll.hpp',
-        'src/err.cpp', 'src/err.hpp',
-        'src/fd.hpp',
-        'src/fq.cpp', 'src/fq.hpp',
-        'src/gssapi_mechanism_base.cpp', 'src/gssapi_mechanism_base.hpp',
-        'src/gssapi_client.cpp', 'src/gssapi_client.hpp',
-        'src/gssapi_server.cpp', 'src/gssapi_server.hpp',
-        'src/i_encoder.hpp',
-        'src/i_engine.hpp',
-        'src/i_decoder.hpp',
-        'src/i_mailbox.hpp',
-        'src/i_poll_events.hpp',
-        'src/io_object.cpp', 'src/io_object.hpp',
-        'src/io_thread.cpp', 'src/io_thread.hpp',
-        'src/ip.cpp', 'src/ip.hpp',
-        'src/ipc_address.cpp', 'src/ipc_address.hpp',
-        'src/ipc_connecter.cpp', 'src/ipc_connecter.hpp',
-        'src/ipc_listener.cpp', 'src/ipc_listener.hpp',
-        'src/kqueue.cpp', 'src/kqueue.hpp',
-        'src/lb.cpp', 'src/lb.hpp',
-        'src/likely.hpp',
-        'src/mailbox.cpp', 'src/mailbox.hpp',
-        'src/mailbox_safe.cpp', 'src/mailbox_safe.hpp',
-        'src/mechanism.cpp', 'src/mechanism.hpp ',
-        'src/metadata.cpp', 'src/metadata.hpp',
-        'src/msg.cpp', 'src/msg.hpp',
-        'src/mtrie.cpp', 'src/mtrie.hpp',
-        'src/mutex.hpp',
-        'src/norm_engine.cpp', 'src/norm_engine.hpp',
-        'src/null_mechanism.cpp', 'src/null_mechanism.hpp',
-        'src/object.cpp', 'src/object.hpp',
-        'src/options.cpp', 'src/options.hpp',
-        'src/own.cpp', 'src/own.hpp',
-        'src/pair.cpp', 'src/pair.hpp',
-        'src/pgm_receiver.cpp', 'src/pgm_receiver.hpp',
-        'src/pgm_sender.cpp', 'src/pgm_sender.hpp',
-        'src/pgm_socket.cpp', 'src/pgm_socket.hpp',
-        'src/pipe.cpp', 'src/pipe.hpp',
-        'src/plain_client.cpp', 'src/plain_client.hpp',
-        'src/plain_server.cpp', 'src/plain_server.hpp',
-        'src/poll.cpp', 'src/poll.hpp',
-        'src/poller.hpp', 'src/poller_base.cpp',
-        'src/poller_base.hpp',
-        'src/proxy.cpp', 'src/proxy.hpp',
-        'src/pub.cpp', 'src/pub.hpp',
-        'src/pull.cpp', 'src/pull.hpp',
-        'src/push.cpp', 'src/push.hpp',
-        'src/radio.cpp', 'src/radio.hpp',
-        'src/random.cpp', 'src/random.hpp',
-        'src/raw_decoder.cpp', 'src/raw_decoder.hpp',
-        'src/raw_encoder.cpp', 'src/raw_encoder.hpp',
-        'src/reaper.cpp', 'src/reaper.hpp',
-        'src/rep.cpp', 'src/rep.hpp',
-        'src/req.cpp', 'src/req.hpp',
-        'src/router.cpp', 'src/router.hpp',
-        'src/select.cpp', 'src/select.hpp',
-        'src/server.cpp', 'src/server.hpp',
-        'src/session_base.cpp', 'src/session_base.hpp',
-        'src/signaler.cpp', 'src/signaler.hpp',
-        'src/socket_base.cpp', 'src/socket_base.hpp',
-        'src/socks.cpp', 'src/socks.hpp',
-        'src/socks_connecter.cpp', 'src/socks_connecter.hpp',
-        'src/stdint.hpp',
-        'src/stream.cpp', 'src/stream.hpp',
-        'src/stream_engine.cpp', 'src/stream_engine.hpp',
-        'src/sub.cpp', 'src/sub.hpp',
-        'src/tcp.cpp', 'src/tcp.hpp',
-        'src/tcp_address.cpp', 'src/tcp_address.hpp',
-        'src/tcp_connecter.cpp', 'src/tcp_connecter.hpp',
-        'src/tcp_listener.cpp', 'src/tcp_listener.hpp',
-        'src/thread.cpp', 'src/thread.hpp',
-        'src/timers.cpp', 'src/timers.hpp',
-        'src/tipc_address.cpp', 'src/tipc_address.hpp',
-        'src/tipc_connecter.cpp', 'src/tipc_connecter.hpp',
-        'src/tipc_listener.cpp', 'src/tipc_listener.hpp',
-        'src/trie.cpp', 'src/trie.hpp',
-        'src/tweetnacl.c', 'src/tweetnacl.h',
-        'src/udp_address.cpp', 'src/udp_address.hpp',
-        'src/udp_engine.cpp', 'src/udp_engine.hpp',
-        'src/v1_decoder.cpp', 'src/v1_decoder.hpp',
-        'src/v2_decoder.cpp', 'src/v2_decoder.hpp',
-        'src/v1_encoder.cpp', 'src/v1_encoder.hpp',
-        'src/v2_encoder.cpp', 'src/v2_encoder.hpp',
-        'src/v2_protocol.hpp',
-        'src/vmci.cpp', 'src/vmci.hpp',
-        'src/vmci_address.cpp', 'src/vmci_address.hpp',
-        'src/vmci_connecter.cpp', 'src/vmci_connecter.hpp',
-        'src/vmci_listener.cpp', 'src/vmci_listener.hpp',
-        'src/windows.hpp',
-        'src/wire.hpp',
-        'src/xpub.cpp', 'src/xpub.hpp',
-        'src/xsub.cpp', 'src/xsub.hpp',
-        'src/ypipe.hpp',
-        'src/ypipe_base.hpp',
-        'src/ypipe_conflate.hpp',
-        'src/yqueue.hpp',
-        'src/zmq.cpp',
-        'src/zmq_utils.cpp',
-        'src/decoder_allocators.cpp', 'src/decoder_allocators.hpp',
-        'src/socket_poller.cpp' 'src/socket_poller.hpp',
-      ],
-      'include_dirs': [
-        'include',
-        'builds/gyp'
-      ],
-      'conditions': [
-        [ 'OS=="win"', {
-            "defines": [
-              "ZMQ_HAVE_WINDOWS=1"
-            ]
-        }],
-        [ 'OS=="mac"', {
-            "defines": [
-              "ZMQ_HAVE_OSX=1"
-            ]
-        }],
-        [ 'OS=="linux"', {
-            "defines": [
-              "ZMQ_HAVE_LINUX=1"
-            ]
-        }]
-      ]
-    }
-  ]
-}
diff --git a/tests/testutil.hpp b/tests/testutil.hpp
index f91cfe13..066a9286 100644
--- a/tests/testutil.hpp
+++ b/tests/testutil.hpp
@@ -32,7 +32,7 @@
 
 #include "../include/zmq.h"
 #include "../src/stdint.hpp"
-#ifdef ZMQ_USING_CMAKE
+#if defined ZMQ_CUSTOM_PLATFORM_HPP
 #   include "platform.hpp"
 #else
 #   include "../src/platform.hpp"