diff options
author | Stephen D. Huston <shuston@apache.org> | 2010-05-28 14:07:25 +0000 |
---|---|---|
committer | Stephen D. Huston <shuston@apache.org> | 2010-05-28 14:07:25 +0000 |
commit | 634b54d79e8b160c8c2e2fd9f61f64e5099a80c1 (patch) | |
tree | b66854f03f9ae58044989a988642f74bbf946d25 /cpp/src/tests/ReplicationTest.cpp | |
parent | 9987421eabe1191c950cdb1d538d03a75883255d (diff) | |
download | qpid-python-634b54d79e8b160c8c2e2fd9f61f64e5099a80c1.tar.gz |
Allow tests that load shareable libs to work on Windows with a debug build. Those libs have a 'd' appended to their name.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@949181 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/ReplicationTest.cpp')
-rw-r--r-- | cpp/src/tests/ReplicationTest.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/tests/ReplicationTest.cpp b/cpp/src/tests/ReplicationTest.cpp index 3b289d1b4e..7310a3fe20 100644 --- a/cpp/src/tests/ReplicationTest.cpp +++ b/cpp/src/tests/ReplicationTest.cpp @@ -20,6 +20,7 @@ */ #include "unit_test.h" #include "test_tools.h" +#include "config.h" #include "BrokerFixture.h" #include "qpid/Plugin.h" @@ -50,11 +51,13 @@ 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); +#if defined (QPID_MODULE_PREFIX) && defined (QPID_MODULE_SUFFIX) +static const char *default_shlib = + QPID_MODULE_PREFIX "replicating_listener" QPID_MODULE_POSTFIX QPID_MODULE_SUFFIX; #else -qpid::sys::Shlib plugin(getLibPath("REPLICATING_LISTENER_LIB")); +static const char *default_shlib = ".libs/replicating_listener.so"; #endif +qpid::sys::Shlib plugin(getLibPath("REPLICATING_LISTENER_LIB", default_shlib)); qpid::broker::Broker::Options getBrokerOpts(const std::vector<std::string>& args) { |