summaryrefslogtreecommitdiff
path: root/cpp/src/tests/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/tests/Makefile.am')
-rw-r--r--cpp/src/tests/Makefile.am13
1 files changed, 7 insertions, 6 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index c9a08e6075..db9da392ea 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -19,6 +19,11 @@ CLEANFILES=
#
# Unit test programs.
#
+TESTS+=Blob
+check_PROGRAMS+=Blob
+Blob_SOURCES=Blob.cpp ../qpid/framing/Blob.cpp
+Blob_LDADD=-lboost_unit_test_framework
+
TESTS+=logging
check_PROGRAMS+=logging
logging_SOURCES=logging.cpp test_tools.h
@@ -120,13 +125,14 @@ check_PROGRAMS += $(testprogs) interop_runner
TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) $(srcdir)/run_test
-system_tests = client_test exception_test quick_topictest
+system_tests = client_test exception_test quick_perftest quick_topictest
TESTS += run-unit-tests start_broker $(system_tests) python_tests stop_broker
EXTRA_DIST += \
test_env run_test vg_check \
run-unit-tests start_broker python_tests stop_broker \
quick_topictest \
+ quick_perftest \
topictest \
.valgrind.supp-default \
.valgrindrc-default \
@@ -172,11 +178,6 @@ all-am: .valgrind.supp .valgrindrc
.valgrind.supp: .valgrind.supp-default
cp $^ $@
-# Tell GNU make not to build targets in this directory in parallel.
-# This is necessary because with two or more identical and simultaneous
-# ltmain invocations, one may corrupt the temporaries of the other.
-.NOTPARALLEL:
-
CLEANFILES+=valgrind.out *.log *.vglog .valgrindrc .valgrind.supp dummy_test $(unit_wrappers)
MAINTAINERCLEANFILES=gen.mk