diff options
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/ReplicationTest.cpp | 9 | ||||
| -rw-r--r-- | cpp/src/tests/Shlib.cpp | 5 |
2 files changed, 9 insertions, 5 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) { diff --git a/cpp/src/tests/Shlib.cpp b/cpp/src/tests/Shlib.cpp index 692cfcdff9..25974d0ebb 100644 --- a/cpp/src/tests/Shlib.cpp +++ b/cpp/src/tests/Shlib.cpp @@ -19,6 +19,7 @@ */ #include "test_tools.h" +#include "config.h" #include "qpid/sys/Shlib.h" #include "qpid/Exception.h" @@ -37,7 +38,7 @@ QPID_AUTO_TEST_CASE(testShlib) { // 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_PREFIX) && defined (QPID_MODULE_SUFFIX) - Shlib sh("./" QPID_MODULE_PREFIX "shlibtest" QPID_MODULE_SUFFIX); + Shlib sh("./" QPID_MODULE_PREFIX "shlibtest" QPID_MODULE_POSTFIX QPID_MODULE_SUFFIX); #else Shlib sh(".libs/libshlibtest.so"); #endif @@ -59,7 +60,7 @@ QPID_AUTO_TEST_CASE(testAutoShlib) { int unloaded = 0; { #if defined (QPID_MODULE_PREFIX) && defined (QPID_MODULE_SUFFIX) - AutoShlib sh("./" QPID_MODULE_PREFIX "shlibtest" QPID_MODULE_SUFFIX); + AutoShlib sh("./" QPID_MODULE_PREFIX "shlibtest" QPID_MODULE_POSTFIX QPID_MODULE_SUFFIX); #else AutoShlib sh(".libs/libshlibtest.so"); #endif |