summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.co.uk>2011-02-22 16:21:19 -0500
committerNicolas Dufresne <nicolas.dufresne@collabora.co.uk>2011-02-22 16:21:19 -0500
commitb24f7974e6afb33e03b986339fab4595b07e4419 (patch)
treeb251b5c629b68e3c9deb6c7e7c2d3678ef24ec16
parentbf0ddf5880de6677cc7ad69f040651b256afd70e (diff)
downloadtelepathy-logger-b24f7974e6afb33e03b986339fab4595b07e4419.tar.gz
Fix valgrind support in tests/dbus
This is just a quick fix, there seems to be redondant stuff between valgrind.mk and the Makefiles.am.
-rw-r--r--tests/dbus/Makefile.am2
-rw-r--r--tools/valgrind.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 642325a..c920d36 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -63,7 +63,7 @@ VALGRIND_TESTS_ENVIRONMENT = \
$(TESTS_ENVIRONMENT) \
env G_SLICE=always-malloc CHECK_VERBOSE=1 \
$(top_builddir)/libtool --mode=execute \
- $(VALGRIND) --suppressions=$(top_srcdir)/tests/tests.supp $(VALGRIND_FLAGS)
+ $(VALGRIND) --suppressions=$(top_srcdir)/tests/suppressions/tpl.supp $(VALGRIND_FLAGS)
BUILT_SOURCES = \
dbus-1/session.conf \
diff --git a/tools/valgrind.mk b/tools/valgrind.mk
index 25a3488..ab146d4 100644
--- a/tools/valgrind.mk
+++ b/tools/valgrind.mk
@@ -2,7 +2,7 @@ VALGRIND = valgrind --tool=memcheck \
--verbose \
--leak-check=full \
--leak-resolution=high \
- --suppressions=$(top_srcdir)/tools/telepathy-glib.supp \
+ --suppressions=$(top_srcdir)/tests/suppressions/tpl.supp \
--child-silent-after-fork=yes \
--num-callers=20 \
--gen-suppressions=all