From 6bb0134ca322b6e50e6ec76a242f89259cd12274 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 30 Nov 2009 19:34:36 +0000 Subject: 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 --- qpid/cpp/src/tests/ReplicationTest.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/src/tests/ReplicationTest.cpp') 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& args) -- cgit v1.2.1