summaryrefslogtreecommitdiff
path: root/qpid/cpp/tests/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp/tests/Makefile.am')
-rw-r--r--qpid/cpp/tests/Makefile.am13
1 files changed, 2 insertions, 11 deletions
diff --git a/qpid/cpp/tests/Makefile.am b/qpid/cpp/tests/Makefile.am
index 999d53df84..76a3cab946 100644
--- a/qpid/cpp/tests/Makefile.am
+++ b/qpid/cpp/tests/Makefile.am
@@ -64,17 +64,8 @@ unit_tests = \
noinst_PROGRAMS = $(client_tests)
-check: run-unit-tests run-python-tests
-
-.PHONY: run-unit-tests
-run-unit-tests: $(check_LTLIBRARIES)
- DllPlugInTester -c -b .libs/*.so
-
-run-python-tests: $(check_LTLIBRARIES) ../src/qpidd
- ../src/qpidd > qpidd.log 2>&1 & pid=$$!; \
- trap 'status=$$?; kill $$pid; exit $$status' 0; \
- trap '(exit $$?); exit $$?' 1 2 13 15; \
- cd ../../python ; ./run-tests -v -I cpp_failing.txt
+TESTS = run-unit-tests run-python-tests
+EXTRA_DIST += $(TESTS)
include gen.mk