diff options
| author | Alan Conway <aconway@apache.org> | 2007-06-07 14:29:24 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-06-07 14:29:24 +0000 |
| commit | 2bc2c756906232e5182cdf0de96840661688297b (patch) | |
| tree | d8c2d4d2464714c442fd70d9780a8eb967a39403 /qpid/cpp/src/tests/Makefile.am | |
| parent | 3a00442a29d77282fe3fb4a810627deae319c796 (diff) | |
| download | qpid-python-2bc2c756906232e5182cdf0de96840661688297b.tar.gz | |
Build support for clustering, initial CPG wrapper & tests.
- src/qpid/cluster/Cpg.cpp: C++ wrapper for the openais CPG library.
- src/tests/unit/Cpg.cpp: verify CPG functions in make check.
- makefiles etc.: build cluster stuff only if openais is installed.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@545190 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/Makefile.am')
| -rw-r--r-- | qpid/cpp/src/tests/Makefile.am | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am index c351408988..9649ce354f 100644 --- a/qpid/cpp/src/tests/Makefile.am +++ b/qpid/cpp/src/tests/Makefile.am @@ -1,14 +1,19 @@ AM_CXXFLAGS = $(WARNING_CFLAGS) $(CPPUNIT_CXXFLAGS) $(APR_CXXFLAGS) INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../gen -I$(top_builddir)/src/gen - -# Unit test programs +# +# Unit test programs. +# UNIT_TESTS= UNIT_TESTS+=logging logging_SOURCES=unit/logging.cpp unit/test_tools.h logging_LDADD=-lboost_unit_test_framework -lboost_regex $(lib_common) +if CLUSTER +include cluster.mk +endif + # NB: CppUnit test libraries below will be migrated to boost test programs. # UNIT_TESTS+= ... @@ -63,7 +68,8 @@ testprogs = \ topic_listener \ topic_publisher -check_PROGRAMS = $(UNIT_TESTS) $(testprogs) interop_runner + +check_PROGRAMS = $(UNIT_TESTS) $(AIS_UNIT_TESTS) $(testprogs) interop_runner # FIXME aconway 2007-05-30: TESTS_ENVIRONMENT should have ./run_test # as below to run valgrind on all test programs. @@ -73,7 +79,7 @@ check_PROGRAMS = $(UNIT_TESTS) $(testprogs) interop_runner TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) SYSTEM_TESTS = client_test quick_topictest -TESTS = $(UNIT_TESTS) run-unit-tests start_broker $(SYSTEM_TESTS) python_tests kill_broker daemon_test +TESTS = $(UNIT_TESTS) run-unit-tests $(RUN_AIS_TESTS) start_broker $(SYSTEM_TESTS) python_tests kill_broker daemon_test EXTRA_DIST = \ test_env \ |