diff options
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/Makefile.am | 11 | ||||
| -rwxr-xr-x | cpp/src/tests/quick_topictest | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index a5d1fdbab5..0c5e43c5ca 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -62,20 +62,19 @@ CLIENT_TESTS = client_test quick_topictest TESTS = run-unit-tests start_broker $(CLIENT_TESTS) python_tests kill_broker EXTRA_DIST = \ - $(TESTS) \ - .vg-supp \ - .valgrindrc.default \ + run-unit-tests start_broker python_tests kill_broker \ + .valgrind.supp \ + .valgrindrc-default \ InProcessBroker.h \ MockChannel.h \ MockConnectionInputHandler.h \ qpid_test_plugin.h \ test_env \ - topicall \ topictest \ APRBaseTest.cpp CLEANFILES=qpidd.log -DISTCLEANFILES=gen.mk +MAINTAINERCLEANFILES=gen.mk include gen.mk @@ -115,5 +114,5 @@ check-unit: # Create a copy so user can modify without risk of checking in their mods. .valgrindrc: .valgrindrc-default - cp .valgrindrc-default .valgrindrc + cp $(srcdir)/.valgrindrc-default .valgrindrc diff --git a/cpp/src/tests/quick_topictest b/cpp/src/tests/quick_topictest index 9df5b5c84c..b1e63b9350 100755 --- a/cpp/src/tests/quick_topictest +++ b/cpp/src/tests/quick_topictest @@ -1,7 +1,9 @@ #!/bin/sh # Quick and quiet topic test for make check. -./topictest -s2 -m2 -b1 > topictest.log 2>&1 || { - echo See topictest.log. +test -z "$srcdir" && srcdir=. +$srcdir/topictest -s2 -m2 -b1 > topictest.log 2>&1 || { + echo $0 FAILED: + cat topictest.log exit 1 } rm topictest.log |