diff options
Diffstat (limited to 'cpp/tests')
| -rw-r--r-- | cpp/tests/Makefile.am | 13 | ||||
| -rwxr-xr-x | cpp/tests/run-python-tests | 15 | ||||
| -rwxr-xr-x | cpp/tests/run-unit-tests | 3 |
3 files changed, 20 insertions, 11 deletions
diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am index 999d53df84..76a3cab946 100644 --- a/cpp/tests/Makefile.am +++ b/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 diff --git a/cpp/tests/run-python-tests b/cpp/tests/run-python-tests new file mode 100755 index 0000000000..57be07ec1c --- /dev/null +++ b/cpp/tests/run-python-tests @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e +log=`pwd`/qpidd.log +# Start the daemon, recording its PID. +../src/qpidd > $log 2>&1 & pid=$! + +# Arrange to kill the daemon upon any type of termination. +trap 'status=$?; kill $pid; exit $status' 0 +trap '(exit $?); exit $?' 1 2 13 15 + +# Run the tests. +cd ../../python && ./run-tests -v -I cpp_failing.txt + +rm -f $log diff --git a/cpp/tests/run-unit-tests b/cpp/tests/run-unit-tests new file mode 100755 index 0000000000..48c502a734 --- /dev/null +++ b/cpp/tests/run-unit-tests @@ -0,0 +1,3 @@ +#!/bin/sh + +DllPlugInTester -c -b .libs/*.so |