diff options
Diffstat (limited to 'qpid/cpp/src/tests/Makefile.am')
| -rw-r--r-- | qpid/cpp/src/tests/Makefile.am | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am index 4a1a8d9a66..6c68a9d648 100644 --- a/qpid/cpp/src/tests/Makefile.am +++ b/qpid/cpp/src/tests/Makefile.am @@ -102,9 +102,6 @@ broker_unit_tests = \ TxPublishTest \ MessageBuilderTest -#client_unit_tests = \ -# ClientChannelTest - framing_unit_tests = \ FramingTest \ HeaderTest \ @@ -121,10 +118,9 @@ unit_tests = \ testprogs= \ client_test \ topic_listener \ - topic_publisher -# echo_service + topic_publisher -check_PROGRAMS += $(testprogs) interop_runner publish consume +check_PROGRAMS += $(testprogs) publish consume TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) QPID_DATA_DIR= $(srcdir)/run_test @@ -172,17 +168,22 @@ gen.mk: Makefile.am CLEANFILES+=valgrind.out *.log *.vglog dummy_test $(unit_wrappers) MAINTAINERCLEANFILES=gen.mk -interop_runner_SOURCES = \ - interop_runner.cpp \ - SimpleTestCaseBase.cpp \ - BasicP2PTest.cpp \ - BasicPubSubTest.cpp \ - SimpleTestCaseBase.h \ - BasicP2PTest.h \ - BasicPubSubTest.h \ - TestCase.h \ - TestOptions.h -interop_runner_LDADD = $(lib_client) $(lib_common) $(extra_libs) +# FIXME aconway 2008-05-23: Disabled interop_runner because it uses +# the obsolete Channel class. Convert to Session and re-enable. +# +# check_PROGRAMS += interop_runner + +# interop_runner_SOURCES = \ +# interop_runner.cpp \ +# SimpleTestCaseBase.cpp \ +# BasicP2PTest.cpp \ +# BasicPubSubTest.cpp \ +# SimpleTestCaseBase.h \ +# BasicP2PTest.h \ +# BasicPubSubTest.h \ +# TestCase.h \ +# TestOptions.h +# interop_runner_LDADD = $(lib_client) $(lib_common) $(extra_libs) publish_SOURCES = publish.cpp publish_LDADD = $(lib_client) $(lib_common) $(extra_libs) |