Install useful tests.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@896535 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 21 insertions, 20 deletions

diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index 9a6e67ca2e..080022da05 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -147,7 +147,7 @@ if SSL
 include ssl.mk
 endif
 
-# receiver, sender are installed and therefore built as part of make, not make check
+# Test programs that are installed and therefore built as part of make, not make check
 qpidtest_PROGRAMS += receiver
 receiver_SOURCES = \
   receiver.cpp \
@@ -162,44 +162,50 @@ sender_SOURCES = \
   ConnectionOptions.h
 sender_LDADD = $(lib_client)
 
-#
-# Other test programs
-#
-check_PROGRAMS+=perftest
+qpidtest_PROGRAMS+=perftest
 perftest_SOURCES=perftest.cpp test_tools.h TestOptions.h ConnectionOptions.h
 perftest_INCLUDES=$(PUBLIC_INCLUDES)
 perftest_LDADD=$(lib_client) 
 
-check_PROGRAMS+=txtest
+qpidtest_PROGRAMS+=txtest
 txtest_INCLUDES=$(PUBLIC_INCLUDES)
 txtest_SOURCES=txtest.cpp  TestOptions.h ConnectionOptions.h
 txtest_LDADD=$(lib_client) 
 
-check_PROGRAMS+=latencytest
+qpidtest_PROGRAMS+=latencytest
 latencytest_INCLUDES=$(PUBLIC_INCLUDES)
 latencytest_SOURCES=latencytest.cpp TestOptions.h ConnectionOptions.h
 latencytest_LDADD=$(lib_client) 
 
-check_PROGRAMS+=echotest
-echotest_INCLUDES=$(PUBLIC_INCLUDES)
-echotest_SOURCES=echotest.cpp TestOptions.h ConnectionOptions.h
-echotest_LDADD=$(lib_client) 
-
-check_PROGRAMS+=client_test
+qpidtest_PROGRAMS+=client_test
 client_test_INCLUDES=$(PUBLIC_INCLUDES)
 client_test_SOURCES=client_test.cpp TestOptions.h ConnectionOptions.h
 client_test_LDADD=$(lib_client) 
 
-check_PROGRAMS+=topic_listener
+qpidtest_PROGRAMS+=topic_listener
 topic_listener_INCLUDES=$(PUBLIC_INCLUDES)
 topic_listener_SOURCES=topic_listener.cpp TestOptions.h ConnectionOptions.h
 topic_listener_LDADD=$(lib_client) 
 
-check_PROGRAMS+=topic_publisher
+qpidtest_PROGRAMS+=topic_publisher
 topic_publisher_INCLUDES=$(PUBLIC_INCLUDES)
 topic_publisher_SOURCES=topic_publisher.cpp TestOptions.h ConnectionOptions.h
 topic_publisher_LDADD=$(lib_client) 
 
+qpidtest_PROGRAMS+=qpid_ping
+qpid_ping_INCLUDES=$(PUBLIC_INCLUDES)
+qpid_ping_SOURCES=qpid_ping.cpp test_tools.h TestOptions.h ConnectionOptions.h
+qpid_ping_LDADD=$(lib_client)
+
+#
+# Other test programs
+#
+
+check_PROGRAMS+=echotest
+echotest_INCLUDES=$(PUBLIC_INCLUDES)
+echotest_SOURCES=echotest.cpp TestOptions.h ConnectionOptions.h
+echotest_LDADD=$(lib_client)
+
 check_PROGRAMS+=publish
 publish_INCLUDES=$(PUBLIC_INCLUDES)
 publish_SOURCES=publish.cpp TestOptions.h ConnectionOptions.h
@@ -253,11 +259,6 @@ check_PROGRAMS+=DispatcherTest
 DispatcherTest_SOURCES=DispatcherTest.cpp
 DispatcherTest_LDADD=$(lib_common) $(SOCKLIBS)
 
-check_PROGRAMS+=qpid_ping
-qpid_ping_INCLUDES=$(PUBLIC_INCLUDES)
-qpid_ping_SOURCES=qpid_ping.cpp test_tools.h TestOptions.h ConnectionOptions.h
-qpid_ping_LDADD=$(lib_client) 
-
 check_PROGRAMS+=datagen
 datagen_SOURCES=datagen.cpp
 datagen_LDADD=$(lib_common)