Problem: radio/dish are not yet stable APIs

Solution: mark them as DRAFT APIs

Makefile.am

@@ -394,8 +394,6 @@ test_apps = \
 	tests/test_sockopt_hwm \
 	tests/test_heartbeats \
 	tests/test_stream_exceeds_buffer \
-	tests/test_radio_dish \
-	tests/test_udp \
 	tests/test_scatter_gather \
 	tests/test_pub_invert_matching
 
@@ -596,12 +594,6 @@ tests_test_heartbeats_LDADD = src/libzmq.la
 tests_test_stream_exceeds_buffer_SOURCES = tests/test_stream_exceeds_buffer.cpp
 tests_test_stream_exceeds_buffer_LDADD = src/libzmq.la
 
-tests_test_radio_dish_SOURCES = tests/test_radio_dish.cpp
-tests_test_radio_dish_LDADD = src/libzmq.la
-
-tests_test_udp_SOURCES = tests/test_udp.cpp
-tests_test_udp_LDADD = src/libzmq.la
-
 tests_test_scatter_gather_SOURCES = tests/test_scatter_gather.cpp
 tests_test_scatter_gather_LDADD = src/libzmq.la
 
@@ -728,7 +720,9 @@ if ENABLE_DRAFTS
 test_apps += tests/test_poller \
 	tests/test_client_server \
 	tests/test_thread_safe \
-	tests/test_timers
+	tests/test_timers \
+	tests/test_radio_dish \
+	tests/test_udp
 
 tests_test_poller_SOURCES = tests/test_poller.cpp
 tests_test_poller_LDADD = src/libzmq.la
@@ -741,6 +735,12 @@ tests_test_thread_safe_LDADD = src/libzmq.la
 
 tests_test_timers_SOURCES = tests/test_timers.cpp
 tests_test_timers_LDADD = src/libzmq.la
+
+tests_test_radio_dish_SOURCES = tests/test_radio_dish.cpp
+tests_test_radio_dish_LDADD = src/libzmq.la
+
+tests_test_udp_SOURCES = tests/test_udp.cpp
+tests_test_udp_LDADD = src/libzmq.la
 endif
 
 check_PROGRAMS = ${test_apps}

include/zmq.h

@@ -260,8 +260,6 @@ ZMQ_EXPORT const char *zmq_msg_group (zmq_msg_t *msg);
 #define ZMQ_XPUB 9
 #define ZMQ_XSUB 10
 #define ZMQ_STREAM 11
-#define ZMQ_RADIO 14
-#define ZMQ_DISH 15
 #define ZMQ_GATHER 16
 #define ZMQ_SCATTER 17
 
@@ -408,8 +406,6 @@ ZMQ_EXPORT int zmq_send (void *s, const void *buf, size_t len, int flags);
 ZMQ_EXPORT int zmq_send_const (void *s, const void *buf, size_t len, int flags);
 ZMQ_EXPORT int zmq_recv (void *s, void *buf, size_t len, int flags);
 ZMQ_EXPORT int zmq_socket_monitor (void *s, const char *addr, int events);
-ZMQ_EXPORT int zmq_join (void *s, const char *group);
-ZMQ_EXPORT int zmq_leave (void *s, const char *group);
 
 
 /******************************************************************************/
@@ -531,6 +527,12 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
 /*  DRAFT Socket types.                                                       */
 #define ZMQ_SERVER 12
 #define ZMQ_CLIENT 13
+#define ZMQ_RADIO 14
+#define ZMQ_DISH 15
+
+/*  DRAFT Socket events.                                                      */
+ZMQ_EXPORT int zmq_join (void *s, const char *group);
+ZMQ_EXPORT int zmq_leave (void *s, const char *group);
 
 /******************************************************************************/
 /*  Poller polling on sockets,fd and thread-safe sockets                      */

src/precompiled.hpp

@@ -155,6 +155,8 @@
 /*  DRAFT Socket types.                                                       */
 #define ZMQ_SERVER 12
 #define ZMQ_CLIENT 13
+#define ZMQ_RADIO 14
+#define ZMQ_DISH 15
 
 /*  DRAFT Socket events.                                                      */
 int zmq_join (void *s, const char *group);

tests/CMakeLists.txt

@@ -64,8 +64,6 @@ set(tests
         test_stream_timeout
         test_xpub_manual
         test_xpub_welcome_msg
-        test_radio_dish
-        test_udp
         test_scatter_gather
 )
 if(NOT WIN32)
@@ -120,6 +118,8 @@ IF (ENABLE_DRAFTS)
         test_thread_safe
         test_client_server
         test_timers
+        test_radio_dish
+        test_udp
     )
 ENDIF (ENABLE_DRAFTS)