diff options
| author | Gordon Sim <gsim@apache.org> | 2006-12-11 10:41:13 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2006-12-11 10:41:13 +0000 |
| commit | 1c314ef50aa7aa5aba1cc934fb9784597ca36987 (patch) | |
| tree | 3cd7354b7c976b4681ed3f6c963b39d1050cce26 | |
| parent | e35e0a3b84a42009d2544ddbf9c7261599a508da (diff) | |
| download | qpid-python-1c314ef50aa7aa5aba1cc934fb9784597ca36987.tar.gz | |
Patch posted to dev listed:
2006-12-08 Jim Meyering <meyering@redhat.com>
Move each test into a script of its own, as Automake requires.
* tests/Makefile.am (TESTS): List test script names here,
rather than listing rules as dependents of "check".
(EXTRA_DIST): Add $(TESTS).
(run-unit-tests, run-python-tests): Remove rules, putting their
contents in the following new scripts.
* tests/run-unit-tests: New one-line script.
* tests/run-python-tests: New script, containing the script
from Makefile.am.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@485592 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/tests/Makefile.am | 13 | ||||
| -rwxr-xr-x | qpid/cpp/tests/run-python-tests | 15 | ||||
| -rwxr-xr-x | qpid/cpp/tests/run-unit-tests | 3 |
3 files changed, 20 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 diff --git a/qpid/cpp/tests/run-python-tests b/qpid/cpp/tests/run-python-tests new file mode 100755 index 0000000000..57be07ec1c --- /dev/null +++ b/qpid/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/qpid/cpp/tests/run-unit-tests b/qpid/cpp/tests/run-unit-tests new file mode 100755 index 0000000000..48c502a734 --- /dev/null +++ b/qpid/cpp/tests/run-unit-tests @@ -0,0 +1,3 @@ +#!/bin/sh + +DllPlugInTester -c -b .libs/*.so |