diff options
| author | Gordon Sim <gsim@apache.org> | 2010-05-14 17:53:26 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2010-05-14 17:53:26 +0000 |
| commit | 3b2c06e6d041487bef584267f80a3cc04008cef9 (patch) | |
| tree | d2850f1f1aaa99ea30298b951cc162fc5d212a72 /cpp/src/tests | |
| parent | 564e4b671d48cdc2f2c2806631c98bf9612007ea (diff) | |
| download | qpid-python-3b2c06e6d041487bef584267f80a3cc04008cef9.tar.gz | |
QPID-664: separate out the messaging API into its own library
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@944357 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | cpp/src/tests/Makefile.am | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/cpp/src/tests/CMakeLists.txt b/cpp/src/tests/CMakeLists.txt index 60339123fb..c645815989 100644 --- a/cpp/src/tests/CMakeLists.txt +++ b/cpp/src/tests/CMakeLists.txt @@ -165,7 +165,7 @@ set_source_files_properties (ReplicationTest.cpp Shlib.cpp ${xml_tests} "-DQPID_MODULE_SUFFIX=\\\"${CMAKE_SHARED_MODULE_SUFFIX}\\\" -DQPID_MODULE_PREFIX=\\\"${CMAKE_SHARED_MODULE_PREFIX}\\\"") target_link_libraries (unit_test ${qpid_test_boost_libs} - qpidclient qpidbroker qmfconsole) + qpidmessaging qpidbroker qmfconsole) remember_location(unit_test) add_library (shlibtest MODULE shlibtest.cpp) @@ -260,16 +260,16 @@ target_link_libraries (receiver qpidclient) remember_location(receiver) add_executable (sender sender.cpp Statistics.cpp ${platform_test_additions}) -target_link_libraries (sender qpidclient) +target_link_libraries (sender qpidmessaging) #sender_SOURCES=sender.cpp TestOptions.h ConnectionOptions.h remember_location(sender) add_executable (qpid_receive qpid_receive.cpp Statistics.cpp ${platform_test_additions}) -target_link_libraries (qpid_receive qpidclient) +target_link_libraries (qpid_receive qpidmessaging) remember_location(qpid_receive) add_executable (qpid_send qpid_send.cpp Statistics.cpp ${platform_test_additions}) -target_link_libraries (qpid_send qpidclient) +target_link_libraries (qpid_send qpidmessaging) remember_location(qpid_send) # perftest and latencytest are generally useful so install them diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index d21896c824..235e6fed04 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -26,6 +26,7 @@ abs_srcdir=@abs_srcdir@ extra_libs = lib_client = $(abs_builddir)/../libqpidclient.la +lib_messaging = $(abs_builddir)/../libqpidmessaging.la lib_common = $(abs_builddir)/../libqpidcommon.la lib_broker = $(abs_builddir)/../libqpidbroker.la lib_console = $(abs_builddir)/../libqmfconsole.la @@ -64,7 +65,7 @@ tmodule_LTLIBRARIES= TESTS+=unit_test check_PROGRAMS+=unit_test unit_test_LDADD=-lboost_unit_test_framework -lboost_regex \ - $(lib_client) $(lib_broker) $(lib_console) + $(lib_messaging) $(lib_broker) $(lib_console) unit_test_SOURCES= unit_test.cpp unit_test.h \ MessagingSessionTests.cpp \ @@ -163,7 +164,7 @@ sender_SOURCES = \ TestOptions.h \ ConnectionOptions.h \ Statistics.cpp -sender_LDADD = $(lib_client) +sender_LDADD = $(lib_messaging) qpidtest_PROGRAMS += qpid_receive qpid_receive_SOURCES = \ @@ -172,7 +173,7 @@ qpid_receive_SOURCES = \ ConnectionOptions.h \ Statistics.h \ Statistics.cpp -qpid_receive_LDADD = $(lib_client) +qpid_receive_LDADD = $(lib_messaging) qpidtest_PROGRAMS += qpid_send qpid_send_SOURCES = \ @@ -181,7 +182,7 @@ qpid_send_SOURCES = \ ConnectionOptions.h \ Statistics.h \ Statistics.cpp -qpid_send_LDADD = $(lib_client) +qpid_send_LDADD = $(lib_messaging) qpidtest_PROGRAMS+=perftest perftest_SOURCES=perftest.cpp test_tools.h TestOptions.h ConnectionOptions.h @@ -304,7 +305,7 @@ qrsh_LDADD=$(lib_client) check_PROGRAMS+=qpid_stream qpid_stream_INCLUDES=$(PUBLIC_INCLUDES) qpid_stream_SOURCES=qpid_stream.cpp -qpid_stream_LDADD=$(lib_client) +qpid_stream_LDADD=$(lib_messaging) TESTS_ENVIRONMENT = \ VALGRIND=$(VALGRIND) \ |