16 files changed, 46 insertions, 44 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6a28e65..f448d8f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,42 +3,42 @@ INCLUDES = -I$(top_builddir)/include \
 
 LDADD = $(top_builddir)/src/libxs.la
 
-noinst_PROGRAMS = test_pair_inproc \
-                  test_pair_tcp \
-                  test_reqrep_inproc \
-                  test_reqrep_tcp \
-                  test_hwm \
-                  test_reqrep_device \
-                  test_sub_forward \
-                  test_invalid_rep \
-                  test_msg_flags \
-                  test_reconnect \
-                  test_linger
+noinst_PROGRAMS = pair_inproc \
+                  pair_tcp \
+                  reqrep_inproc \
+                  reqrep_tcp \
+                  hwm \
+                  reqrep_device \
+                  sub_forward \
+                  invalid_rep \
+                  msg_flags \
+                  reconnect \
+                  linger
 
 if !ON_MINGW
-noinst_PROGRAMS += test_shutdown_stress \
-                   test_pair_ipc \
-                   test_reqrep_ipc \
-                   test_timeo
+noinst_PROGRAMS += shutdown_stress \
+                   pair_ipc \
+                   reqrep_ipc \
+                   timeo
 endif
 
-test_pair_inproc_SOURCES = test_pair_inproc.cpp testutil.hpp
-test_pair_tcp_SOURCES = test_pair_tcp.cpp testutil.hpp
-test_reqrep_inproc_SOURCES = test_reqrep_inproc.cpp testutil.hpp
-test_reqrep_tcp_SOURCES = test_reqrep_tcp.cpp testutil.hpp
-test_hwm_SOURCES = test_hwm.cpp
-test_reqrep_device_SOURCES = test_reqrep_device.cpp
-test_sub_forward_SOURCES = test_sub_forward.cpp
-test_invalid_rep_SOURCES = test_invalid_rep.cpp
-test_msg_flags_SOURCES = test_msg_flags.cpp
-test_reconnect_SOURCES = test_reconnect.cpp
-test_linger_SOURCES = test_linger.cpp
+pair_inproc_SOURCES = pair_inproc.cpp testutil.hpp
+pair_tcp_SOURCES = pair_tcp.cpp testutil.hpp
+reqrep_inproc_SOURCES = reqrep_inproc.cpp testutil.hpp
+reqrep_tcp_SOURCES = reqrep_tcp.cpp testutil.hpp
+hwm_SOURCES = hwm.cpp
+reqrep_device_SOURCES = reqrep_device.cpp
+sub_forward_SOURCES = sub_forward.cpp
+invalid_rep_SOURCES = invalid_rep.cpp
+msg_flags_SOURCES = msg_flags.cpp
+reconnect_SOURCES = reconnect.cpp
+linger_SOURCES = linger.cpp
 
 if !ON_MINGW
-test_shutdown_stress_SOURCES = test_shutdown_stress.cpp
-test_pair_ipc_SOURCES = test_pair_ipc.cpp testutil.hpp
-test_reqrep_ipc_SOURCES = test_reqrep_ipc.cpp testutil.hpp
-test_timeo_SOURCES = test_timeo.cpp
+shutdown_stress_SOURCES = shutdown_stress.cpp
+pair_ipc_SOURCES = pair_ipc.cpp testutil.hpp
+reqrep_ipc_SOURCES = reqrep_ipc.cpp testutil.hpp
+timeo_SOURCES = timeo.cpp
 endif
 
 TESTS = $(noinst_PROGRAMS)
diff --git a/tests/test_hwm.cpp b/tests/hwm.cpp
index 1a520c0..a5163f9 100644
--- a/tests/test_hwm.cpp
+++ b/tests/hwm.cpp
@@ -22,7 +22,7 @@
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_hwm running...\n");
+    fprintf (stderr, "hwm test running...\n");
 
     void *ctx = xs_init (1);
     assert (ctx);
diff --git a/tests/test_invalid_rep.cpp b/tests/invalid_rep.cpp
index 70a14e5..8a33eb1 100644
--- a/tests/test_invalid_rep.cpp
+++ b/tests/invalid_rep.cpp
@@ -23,7 +23,7 @@
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_invalid_rep running...\n");
+    fprintf (stderr, "invalid_rep test running...\n");
 
     //  Create REQ/XREP wiring.
     void *ctx = xs_init (1);
diff --git a/tests/test_linger.cpp b/tests/linger.cpp
index 0a5bc49..a9feec3 100644
--- a/tests/test_linger.cpp
+++ b/tests/linger.cpp
@@ -22,7 +22,7 @@
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_linger running...\n");
+    fprintf (stderr, "linger test running...\n");
 
     //  Create REQ/XREP wiring.
     void *ctx = xs_init (1);
diff --git a/tests/test_msg_flags.cpp b/tests/msg_flags.cpp
index 6c2b819..326b2b4 100644
--- a/tests/test_msg_flags.cpp
+++ b/tests/msg_flags.cpp
@@ -22,6 +22,8 @@
 
 int XS_TEST_MAIN ()
 {
+    fprintf (stderr, "msg_flags test running...\n");
+
     //  Create the infrastructure
     void *ctx = xs_init (1);
     assert (ctx);
diff --git a/tests/test_pair_inproc.cpp b/tests/pair_inproc.cpp
index 653daca..8d4202a 100644
--- a/tests/test_pair_inproc.cpp
+++ b/tests/pair_inproc.cpp
@@ -22,7 +22,7 @@
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_pair_inproc running...\n");
+    fprintf (stderr, "pair_inproc test running...\n");
 
     void *ctx = xs_init (1);
     assert (ctx);
diff --git a/tests/test_pair_ipc.cpp b/tests/pair_ipc.cpp
index 8e7f17e..c9dd5ae 100644
--- a/tests/test_pair_ipc.cpp
+++ b/tests/pair_ipc.cpp
@@ -22,7 +22,7 @@
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_pair_ipc running...\n");
+    fprintf (stderr, "pair_ipc test running...\n");
 
     void *ctx = xs_init (1);
     assert (ctx);
diff --git a/tests/test_pair_tcp.cpp b/tests/pair_tcp.cpp
index bf4fcd8..9e71159 100644
--- a/tests/test_pair_tcp.cpp
+++ b/tests/pair_tcp.cpp
@@ -23,7 +23,7 @@
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_pair_tcp running...\n");
+    fprintf (stderr, "pair_tcp test running...\n");
 
     void *ctx = xs_init (1);
     assert (ctx);
diff --git a/tests/test_reconnect.cpp b/tests/reconnect.cpp
index 7ae505e..6442b38 100644
--- a/tests/test_reconnect.cpp
+++ b/tests/reconnect.cpp
@@ -22,7 +22,7 @@
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_reconnect running...\n");
+    fprintf (stderr, "reconnect test running...\n");
 
     //  Create the basic infrastructure.
     void *ctx = xs_init (1);
diff --git a/tests/test_reqrep_device.cpp b/tests/reqrep_device.cpp
index 68ee347..8b0d807 100644
--- a/tests/test_reqrep_device.cpp
+++ b/tests/reqrep_device.cpp
@@ -23,7 +23,7 @@
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_reqrep_device running...\n");
+    fprintf (stderr, "reqrep_device test running...\n");
 
     void *ctx = xs_init (1);
     assert (ctx);
diff --git a/tests/test_reqrep_inproc.cpp b/tests/reqrep_inproc.cpp
index 89080eb..b056a6a 100644
--- a/tests/test_reqrep_inproc.cpp
+++ b/tests/reqrep_inproc.cpp
@@ -22,7 +22,7 @@
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_reqrep_inproc running...\n");
+    fprintf (stderr, "reqrep_inproc test running...\n");
 
     void *ctx = xs_init (1);
     assert (ctx);
diff --git a/tests/test_reqrep_ipc.cpp b/tests/reqrep_ipc.cpp
index 557b8af..3d1092e 100644
--- a/tests/test_reqrep_ipc.cpp
+++ b/tests/reqrep_ipc.cpp
@@ -22,7 +22,7 @@
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_reqrep_ipc running...\n");
+    fprintf (stderr, "reqrep_ipc test running...\n");
 
     void *ctx = xs_init (1);
     assert (ctx);
diff --git a/tests/test_reqrep_tcp.cpp b/tests/reqrep_tcp.cpp
index e86f947..d66f726 100644
--- a/tests/test_reqrep_tcp.cpp
+++ b/tests/reqrep_tcp.cpp
@@ -23,7 +23,7 @@
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_reqrep_tcp running...\n");
+    fprintf (stderr, "reqrep_tcp test running...\n");
 
     void *ctx = xs_init (1);
     assert (ctx);
diff --git a/tests/test_shutdown_stress.cpp b/tests/shutdown_stress.cpp
index 7c36106..d0156ff 100644
--- a/tests/test_shutdown_stress.cpp
+++ b/tests/shutdown_stress.cpp
@@ -53,7 +53,7 @@ int XS_TEST_MAIN ()
     int rc;
     pthread_t threads [THREAD_COUNT];
 
-    fprintf (stderr, "test_shutdown_stress running...\n");
+    fprintf (stderr, "shutdown_stress test running...\n");
 
     for (j = 0; j != 10; j++) {
 
diff --git a/tests/test_sub_forward.cpp b/tests/sub_forward.cpp
index dafd338..2111d5a 100644
--- a/tests/test_sub_forward.cpp
+++ b/tests/sub_forward.cpp
@@ -23,7 +23,7 @@
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_sub_forward running...\n");
+    fprintf (stderr, "sub_forward test running...\n");
 
     void *ctx = xs_init (1);
     assert (ctx);
diff --git a/tests/test_timeo.cpp b/tests/timeo.cpp
index 29ed634..f718056 100644
--- a/tests/test_timeo.cpp
+++ b/tests/timeo.cpp
@@ -42,7 +42,7 @@ extern "C"
 
 int XS_TEST_MAIN ()
 {
-    fprintf (stderr, "test_timeo running...\n");
+    fprintf (stderr, "timeo test running...\n");
 
     void *ctx = xs_init (1);
     assert (ctx);