diff options
| author | Alan Conway <aconway@apache.org> | 2008-07-08 19:03:52 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-07-08 19:03:52 +0000 |
| commit | c039e063a3add797a41a1975947a52b7e30d9991 (patch) | |
| tree | 3057c436c1e175c2dcfdba91da8aa7fbb224f9d2 /qpid/cpp/src/tests | |
| parent | 9876f2fd2416d543f77057c88ebf3de392cdab12 (diff) | |
| download | qpid-python-c039e063a3add797a41a1975947a52b7e30d9991.tar.gz | |
Revert un-necessary Plugin complications. Better solution for plugin extension points coming up...
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@674915 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/cluster.mk | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/cluster_test.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am index f72264d69a..0fadc39c8b 100644 --- a/qpid/cpp/src/tests/Makefile.am +++ b/qpid/cpp/src/tests/Makefile.am @@ -135,7 +135,8 @@ EXTRA_DIST += \ MessageUtils.h \ TestMessageStore.h \ MockConnectionInputHandler.h \ - TxMocks.h + TxMocks.h \ + qpid_test_plugin.h check_LTLIBRARIES += libdlclose_noop.la libdlclose_noop_la_LDFLAGS = -module -rpath $(abs_builddir) diff --git a/qpid/cpp/src/tests/cluster.mk b/qpid/cpp/src/tests/cluster.mk index 8c6c69db21..da5b4d6e90 100644 --- a/qpid/cpp/src/tests/cluster.mk +++ b/qpid/cpp/src/tests/cluster.mk @@ -17,6 +17,6 @@ EXTRA_DIST+=ais_check check_PROGRAMS+=cluster_test cluster_test_SOURCES=unit_test.cpp cluster_test.cpp -cluster_test_LDADD=$(lib_client) $(lib_cluster) $(lib_broker) -lboost_unit_test_framework +cluster_test_LDADD=$(lib_client) $(lib_cluster) -lboost_unit_test_framework endif diff --git a/qpid/cpp/src/tests/cluster_test.cpp b/qpid/cpp/src/tests/cluster_test.cpp index 82d18aceff..65aa4d5a28 100644 --- a/qpid/cpp/src/tests/cluster_test.cpp +++ b/qpid/cpp/src/tests/cluster_test.cpp @@ -60,7 +60,7 @@ struct ClusterFixture : public ptr_vector<ForkedBroker> { void ClusterFixture::add() { broker::Broker::Options opts; - Plugin::Factory::addOptions(opts); // For cluster options. + Plugin::addOptions(opts); // For cluster options. const char* argv[] = { "", "--cluster-name", name.c_str(), "--auth=no", "--no-data-dir" }; |