summaryrefslogtreecommitdiff
path: root/cpp/src/tests/Makefile.am
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-05-14 15:39:02 +0000
committerAlan Conway <aconway@apache.org>2008-05-14 15:39:02 +0000
commitddb57760e7e3ec1ea54a8dfccd9b3087cbffb80a (patch)
tree7f2362e2a884b7193864521539d75207de07b8ab /cpp/src/tests/Makefile.am
parent0a554501a3cce16c56fb11f7e9b53d9720fecb92 (diff)
downloadqpid-python-ddb57760e7e3ec1ea54a8dfccd9b3087cbffb80a.tar.gz
Fix valgrind problems in VPATH builds.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@656320 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/Makefile.am')
-rw-r--r--cpp/src/tests/Makefile.am13
1 files changed, 10 insertions, 3 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index cb060cb2b4..0c77f1c605 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -125,10 +125,17 @@ testprogs= \
client_test \
topic_listener \
topic_publisher
-# echo_service
check_PROGRAMS += $(testprogs) interop_runner publish consume
+# Copy the SVN valgrind files to the real valgrind files so we will
+# have the real files in the working dir for VPATH or in-tree builds.
+check_DATA = .valgrindrc .valgrind.suppress
+.valgrindrc: valgrindrc
+ cp $^ $@
+.valgrind.suppress: valgrind.suppress
+ cp $^ $@
+
TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) QPID_DATA_DIR= $(srcdir)/run_test
system_tests = client_test quick_perftest quick_topictest
@@ -141,8 +148,8 @@ EXTRA_DIST += \
quick_perftest \
topictest \
run_federation_tests \
- .valgrind.supp \
- .valgrindrc \
+ valgrind.suppress \
+ valgrindrc \
MessageUtils.h \
MockConnectionInputHandler.h \
TxMocks.h \