summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/ReplicationTest.cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-11-30 19:34:36 +0000
committerAlan Conway <aconway@apache.org>2009-11-30 19:34:36 +0000
commit6bb0134ca322b6e50e6ec76a242f89259cd12274 (patch)
tree74ab33d008364a6b72fd879a0ad99693c42da33c /qpid/cpp/src/tests/ReplicationTest.cpp
parentf4b13c8d16754f29a331fe7ec2c7e1bc7995c524 (diff)
downloadqpid-python-6bb0134ca322b6e50e6ec76a242f89259cd12274.tar.gz
Clean up test environment variables, prepare for running more tests in cmake.
- consolidate test env vars in test_env.sh, also useful from command line. - generate test_env.sh with autoconf/cmake to cover library location differences. - Remove explicit mention of .libs, use $QPID_MODULE_DIR to load modules. - Fix run_test to run valgrind under cmake git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@885557 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/ReplicationTest.cpp')
-rw-r--r--qpid/cpp/src/tests/ReplicationTest.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/ReplicationTest.cpp b/qpid/cpp/src/tests/ReplicationTest.cpp
index ed768f1306..3b289d1b4e 100644
--- a/qpid/cpp/src/tests/ReplicationTest.cpp
+++ b/qpid/cpp/src/tests/ReplicationTest.cpp
@@ -47,12 +47,13 @@ namespace tests {
QPID_AUTO_TEST_SUITE(ReplicationTestSuite)
+// FIXME aconway 2009-11-26: clean this up.
// The CMake-based build passes in the module suffix; if it's not there, this
// is a Linux/UNIX libtool-based build.
#if defined (QPID_MODULE_SUFFIX)
qpid::sys::Shlib plugin("replicating_listener" QPID_MODULE_SUFFIX);
#else
-qpid::sys::Shlib plugin("../.libs/replicating_listener.so");
+qpid::sys::Shlib plugin(getLibPath("REPLICATING_LISTENER_LIB"));
#endif
qpid::broker::Broker::Options getBrokerOpts(const std::vector<std::string>& args)