From 81ce314de5b5d7ffaa76a608cb54023e89e998ae Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Wed, 14 May 2008 15:39:02 +0000
Subject: Fix valgrind problems in VPATH builds.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@656320 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/tests/Makefile.am | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'qpid/cpp/src/tests/Makefile.am')

diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index cb060cb2b4..0c77f1c605 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/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								\
-- 
cgit v1.2.1