summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/Makefile.am
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-05-14 19:10:30 +0000
committerAlan Conway <aconway@apache.org>2008-05-14 19:10:30 +0000
commit2c7075bed5bf47dd6191d98a41adeaedfeabbf3b (patch)
tree1e34b13981bd1a5ec3eed596ec85e10f8eff195b /qpid/cpp/src/tests/Makefile.am
parent81f7b4aaeede6a9eedbba4a7e2c2e2991ec48bd1 (diff)
downloadqpid-python-2c7075bed5bf47dd6191d98a41adeaedfeabbf3b.tar.gz
Undo revision 656320, causing build problems.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@656369 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/Makefile.am')
-rw-r--r--qpid/cpp/src/tests/Makefile.am13
1 files changed, 3 insertions, 10 deletions
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index 0c77f1c605..cb060cb2b4 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -125,17 +125,10 @@ 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
@@ -148,8 +141,8 @@ EXTRA_DIST += \
quick_perftest \
topictest \
run_federation_tests \
- valgrind.suppress \
- valgrindrc \
+ .valgrind.supp \
+ .valgrindrc \
MessageUtils.h \
MockConnectionInputHandler.h \
TxMocks.h \