summaryrefslogtreecommitdiff
path: root/cpp/src/tests/Makefile.am
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2009-05-01 19:17:59 +0000
committerKim van der Riet <kpvdr@apache.org>2009-05-01 19:17:59 +0000
commitf3cec6986a366d133a08647279a38393a9769718 (patch)
treea3388944e36fb8cde72f3f3b38254e88709493bd /cpp/src/tests/Makefile.am
parent38dc8e231d6136dd6ae0cfa28f4f9dcb90677c77 (diff)
downloadqpid-python-f3cec6986a366d133a08647279a38393a9769718.tar.gz
Cluster test code now has a persistence switch controlled by the environment. When this switch set, all brokers start with the store module loaded, all queues are declared persistent and all messages are also made persistent. The absolute paths to module libs hardcoded into the test fixtures have been replaced by paths relative to environment variable QPID_LIB_DIR (which is set in Makefile.am). The cluster test, when run from qpid, will continue to run without persistence by default; the intention is to have the store test code run this test directly with the switch turned on.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@770796 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/Makefile.am')
-rw-r--r--cpp/src/tests/Makefile.am8
1 files changed, 7 insertions, 1 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 161428fcad..98d101049b 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -211,7 +211,13 @@ check_PROGRAMS+=DispatcherTest
DispatcherTest_SOURCES=DispatcherTest.cpp
DispatcherTest_LDADD=$(lib_common) $(SOCKLIBS)
-TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) QPID_DATA_DIR= BOOST_TEST_SHOW_PROGRESS=yes $(srcdir)/run_test
+TESTS_ENVIRONMENT = \
+ VALGRIND=$(VALGRIND) \
+ srcdir=$(srcdir) \
+ QPID_DATA_DIR= \
+ QPID_LIB_DIR=../.libs \
+ BOOST_TEST_SHOW_PROGRESS=yes \
+ $(srcdir)/run_test
system_tests = client_test quick_perftest quick_topictest run_header_test quick_txtest
TESTS += start_broker $(system_tests) python_tests stop_broker run_federation_tests run_acl_tests run_cli_tests replication_test