summaryrefslogtreecommitdiff
path: root/cpp/src/tests/Makefile.am
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2009-07-01 15:21:54 +0000
committerKim van der Riet <kpvdr@apache.org>2009-07-01 15:21:54 +0000
commit344067e253c58f6ee2ed985752d184d00667b8c1 (patch)
tree29f66bef606c79e2c695569be62ceacca5136216 /cpp/src/tests/Makefile.am
parentfde0edfd5204ff68fc38f06afb1ad08028119e32 (diff)
downloadqpid-python-344067e253c58f6ee2ed985752d184d00667b8c1.tar.gz
Fix for cluster_test problems: a) When not started from within test dir, qpidd is not found, and a process cascade results in which each forked process continues and runs all tests after its own instead of terminating; b) Hard-coded paths and names of libs, which have been moved into Makefile.am; c) Some tests use ScopedSuppressLogging, these tests are modified so the scope of the logging suppression does not include the broker/cluster startup.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@790215 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/Makefile.am')
-rw-r--r--cpp/src/tests/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index f08d5a47ba..ec34a07e9e 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -244,7 +244,9 @@ TESTS_ENVIRONMENT = \
srcdir=$(srcdir) \
top_builddir=$(top_builddir) \
QPID_DATA_DIR= \
- QPID_LIB_DIR=../.libs \
+ ACL_LIB=../.libs/acl.so \
+ CLUSTER_LIB=../.libs/cluster.so \
+ TEST_STORE_LIB=.libs/test_store.so \
BOOST_TEST_SHOW_PROGRESS=yes \
$(srcdir)/run_test