summaryrefslogtreecommitdiff
path: root/cpp/src/tests/Makefile.am
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2009-05-26 15:30:47 +0000
committerKim van der Riet <kpvdr@apache.org>2009-05-26 15:30:47 +0000
commit03fdb8e9e281cc317099fdcf67d05098b9d38131 (patch)
tree2805fbfef193089797071c87f276b919414c2c77 /cpp/src/tests/Makefile.am
parentfdba1a9ed5074286fe58ebf9be543bbebea0bb79 (diff)
downloadqpid-python-03fdb8e9e281cc317099fdcf67d05098b9d38131.tar.gz
Added installable python cluster tests that can be run from an external store build/test environment and can test persistent clusters.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@778751 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/Makefile.am')
-rw-r--r--cpp/src/tests/Makefile.am33
1 files changed, 25 insertions, 8 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 8d66bc0828..64cd713f1a 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -39,6 +39,16 @@ CLEANFILES=
LONG_TESTS=
#
+# Destination for intalled programs and tests defined here
+#
+qpidexecdir = $(libexecdir)/qpid
+qpidexec_PROGRAMS =
+qpidexec_SCRIPTS =
+qpidtestdir = $(qpidexecdir)/test
+qpidtest_PROGRAMS =
+qpidtest_SCRIPTS =
+
+#
# Unit test program
#
# Unit tests are built as a single program to reduce valgrind overhead
@@ -128,6 +138,21 @@ if SSL
include ssl.mk
endif
+# receiver, sender are installed and therefore built as part of make, not make check
+qpidtest_PROGRAMS += receiver
+receiver_SOURCES = \
+ receiver.cpp \
+ TestOptions.h \
+ ConnectionOptions.h
+receiver_LDADD = $(lib_client)
+
+qpidtest_PROGRAMS += sender
+sender_SOURCES = \
+ sender.cpp \
+ TestOptions.h \
+ ConnectionOptions.h
+sender_LDADD = $(lib_client)
+
#
# Other test programs
#
@@ -195,14 +220,6 @@ check_PROGRAMS+=txjob
txjob_SOURCES=txjob.cpp TestOptions.h ConnectionOptions.h
txjob_LDADD=$(lib_client)
-check_PROGRAMS+=receiver
-receiver_SOURCES=receiver.cpp TestOptions.h ConnectionOptions.h
-receiver_LDADD=$(lib_client)
-
-check_PROGRAMS+=sender
-sender_SOURCES=sender.cpp TestOptions.h ConnectionOptions.h
-sender_LDADD=$(lib_client)
-
check_PROGRAMS+=PollerTest
PollerTest_SOURCES=PollerTest.cpp
PollerTest_LDADD=$(lib_common) $(SOCKLIBS)