NO-JIRA: Install test executables and scripts.

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

3 files changed, 19 insertions, 19 deletions

diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index 3c9ca1b70f..2b8890eb26 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -51,9 +51,9 @@ CLEAN_LOCAL=
 qpidexecdir = $(libexecdir)/qpid
 qpidexec_PROGRAMS =
 qpidexec_SCRIPTS =
-qpidtestdir = $(qpidexecdir)/tests
-qpidtest_PROGRAMS =
-qpidtest_SCRIPTS =
+qpidexectestdir = $(qpidexecdir)/tests
+qpidexectest_PROGRAMS =
+qpidexectest_SCRIPTS =
 tmoduledir = $(libdir)/qpid/tests
 tmodule_LTLIBRARIES=
 
@@ -150,17 +150,17 @@ endif
 
 # Test programs that are installed and therefore built as part of make, not make check
 
-qpidtest_SCRIPTS += qpid-cpp-benchmark install_env.sh
+qpidexectest_SCRIPTS += qpid-cpp-benchmark install_env.sh
 EXTRA_DIST += qpid-cpp-benchmark install_env.sh
 
-qpidtest_PROGRAMS += receiver
+qpidexectest_PROGRAMS += receiver
 receiver_SOURCES = \
   receiver.cpp \
   TestOptions.h \
   ConnectionOptions.h
 receiver_LDADD = $(lib_client)
 
-qpidtest_PROGRAMS += sender
+qpidexectest_PROGRAMS += sender
 sender_SOURCES = \
   sender.cpp \
   TestOptions.h \
@@ -168,7 +168,7 @@ sender_SOURCES = \
   Statistics.cpp
 sender_LDADD = $(lib_messaging)
 
-qpidtest_PROGRAMS += qpid-receive
+qpidexectest_PROGRAMS += qpid-receive
 qpid_receive_SOURCES = \
   qpid-receive.cpp \
   TestOptions.h \
@@ -177,7 +177,7 @@ qpid_receive_SOURCES = \
   Statistics.cpp
 qpid_receive_LDADD = $(lib_messaging)
 
-qpidtest_PROGRAMS += qpid-send
+qpidexectest_PROGRAMS += qpid-send
 qpid_send_SOURCES = \
   qpid-send.cpp \
   TestOptions.h \
@@ -186,37 +186,37 @@ qpid_send_SOURCES = \
   Statistics.cpp
 qpid_send_LDADD = $(lib_messaging)
 
-qpidtest_PROGRAMS+=qpid-perftest
+qpidexectest_PROGRAMS+=qpid-perftest
 qpid_perftest_SOURCES=qpid-perftest.cpp test_tools.h TestOptions.h ConnectionOptions.h
 qpid_perftest_INCLUDES=$(PUBLIC_INCLUDES)
 qpid_perftest_LDADD=$(lib_client) 
 
-qpidtest_PROGRAMS+=qpid-txtest
+qpidexectest_PROGRAMS+=qpid-txtest
 qpid_txtest_INCLUDES=$(PUBLIC_INCLUDES)
 qpid_txtest_SOURCES=qpid-txtest.cpp  TestOptions.h ConnectionOptions.h
 qpid_txtest_LDADD=$(lib_client) 
 
-qpidtest_PROGRAMS+=qpid-latency-test
+qpidexectest_PROGRAMS+=qpid-latency-test
 qpid_latency_test_INCLUDES=$(PUBLIC_INCLUDES)
 qpid_latency_test_SOURCES=qpid-latency-test.cpp TestOptions.h ConnectionOptions.h
 qpid_latency_test_LDADD=$(lib_client) 
 
-qpidtest_PROGRAMS+=qpid-client-test
+qpidexectest_PROGRAMS+=qpid-client-test
 qpid_client_test_INCLUDES=$(PUBLIC_INCLUDES)
 qpid_client_test_SOURCES=qpid-client-test.cpp TestOptions.h ConnectionOptions.h
 qpid_client_test_LDADD=$(lib_client) 
 
-qpidtest_PROGRAMS+=qpid-topic-listener
+qpidexectest_PROGRAMS+=qpid-topic-listener
 qpid_topic_listener_INCLUDES=$(PUBLIC_INCLUDES)
 qpid_topic_listener_SOURCES=qpid-topic-listener.cpp TestOptions.h ConnectionOptions.h
 qpid_topic_listener_LDADD=$(lib_client) 
 
-qpidtest_PROGRAMS+=qpid-topic-publisher
+qpidexectest_PROGRAMS+=qpid-topic-publisher
 qpid_topic_publisher_INCLUDES=$(PUBLIC_INCLUDES)
 qpid_topic_publisher_SOURCES=qpid-topic-publisher.cpp TestOptions.h ConnectionOptions.h
 qpid_topic_publisher_LDADD=$(lib_client) 
 
-qpidtest_PROGRAMS+=qpid-ping
+qpidexectest_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)
diff --git a/qpid/cpp/src/tests/cluster.mk b/qpid/cpp/src/tests/cluster.mk
index c4216cbd3d..6db2215859 100644
--- a/qpid/cpp/src/tests/cluster.mk
+++ b/qpid/cpp/src/tests/cluster.mk
@@ -80,7 +80,7 @@ LONG_TESTS +=					\
 	cluster_python_tests			\
 	stop_cluster
 
-qpidtest_PROGRAMS += cluster_test
+qpidexectest_PROGRAMS += cluster_test
 
 cluster_test_SOURCES =				\
     cluster_test.cpp			\
@@ -96,7 +96,7 @@ cluster_test_SOURCES =				\
 
 cluster_test_LDADD=$(lib_client) $(lib_broker) ../cluster.la -lboost_unit_test_framework
 
-qpidtest_SCRIPTS += run_cluster_tests brokertest.py cluster_tests.py cluster_test_logs.py run_long_cluster_tests long_cluster_tests.py testlib.py cluster_tests.fail
-qpidtest_SCRIPTS += $(CLUSTER_TEST_SCRIPTS_LIST)
+qpidexectest_SCRIPTS += run_cluster_tests brokertest.py cluster_tests.py cluster_test_logs.py run_long_cluster_tests long_cluster_tests.py testlib.py cluster_tests.fail
+qpidexectest_SCRIPTS += $(CLUSTER_TEST_SCRIPTS_LIST)
 
 endif
diff --git a/qpid/cpp/src/tests/testagent.mk b/qpid/cpp/src/tests/testagent.mk
index 19d91ccab9..25cf43d71e 100644
--- a/qpid/cpp/src/tests/testagent.mk
+++ b/qpid/cpp/src/tests/testagent.mk
@@ -43,7 +43,7 @@ testagent_gen.timestamp: testagent.xml ${TESTAGENT_DEPS}
 CLEANFILES+=$(TESTAGENT_GEN_SRC) testagent_gen.timestamp
 
 testagent-testagent.$(OBJEXT): $(TESTAGENT_GEN_SRC)
-qpidtest_PROGRAMS+=testagent
+qpidexectest_PROGRAMS+=testagent
 testagent_CXXFLAGS=$(CXXFLAGS) -Itestagent_gen
 testagent_SOURCES=testagent.cpp $(TESTAGENT_GEN_SRC)
 testagent_LDADD=$(top_builddir)/src/libqmf.la