diff options
author | Alan Conway <aconway@apache.org> | 2009-11-30 19:34:36 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2009-11-30 19:34:36 +0000 |
commit | 7a70ee7193a85ceb52cbfe3df2684e947cee9456 (patch) | |
tree | 3f8c78519d4169bc7c0ec8015a684879527a5350 /cpp/src/tests/ReplicationTest.cpp | |
parent | d3e2aeef6229259be003071988706c934677ff43 (diff) | |
download | qpid-python-7a70ee7193a85ceb52cbfe3df2684e947cee9456.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/qpid@885557 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/ReplicationTest.cpp')
-rw-r--r-- | cpp/src/tests/ReplicationTest.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/tests/ReplicationTest.cpp b/cpp/src/tests/ReplicationTest.cpp index ed768f1306..3b289d1b4e 100644 --- a/cpp/src/tests/ReplicationTest.cpp +++ b/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) |