[Telepathy-commits] [telepathy-glib/master] tests: use libtool --mode=execute correctly

[Simon McVittie]

This turns out to be necessary to valgrind the tests on Debian post-Lenny.
---
 tests/Makefile.am      |   12 +++++-------
 tests/dbus/Makefile.am |   14 ++++----------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4e5c17e..705dc93 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,24 +4,23 @@ SUBDIRS = \
     dbus \
     tools
 
-DYNAMIC_TESTS = \
+noinst_PROGRAMS = \
     test-asv \
     test-availability-cmp \
     test-heap \
+    test-internal-debug \
     test-intset \
     test-util
-STATIC_TESTS = \
-    test-internal-debug
 
-noinst_PROGRAMS = $(DYNAMIC_TESTS) $(STATIC_TESTS)
 TESTS = $(noinst_PROGRAMS)
 TESTS_ENVIRONMENT = \
+    abs_top_builddir=@abs_top_builddir@ \
     G_DEBUG=fatal_warnings,fatal_criticals
 
 VALGRIND_TESTS_ENVIRONMENT = \
     G_SLICE=always-malloc \
     $(TESTS_ENVIRONMENT) \
-    $(top_builddir)/tools/telepathy-glib-env \
+    $(top_builddir)/libtool --mode=execute \
     valgrind --tool=memcheck --leak-check=full --show-reachable=yes \
         --suppressions=$(top_srcdir)/examples/tp-glib-examples.supp \
         --child-silent-after-fork=yes --num-callers=20 --error-exitcode=42 \
@@ -30,8 +29,7 @@ VALGRIND_TESTS_ENVIRONMENT = \
 
 check-valgrind:
 	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		TESTS="$(STATIC_TESTS) $(DYNAMIC_TESTS:%=.libs/%)"
+		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)"
 	$(MAKE) -C dbus check-valgrind
 
 EXTRA_DIST = README
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 1d8f9f3..3094e5f 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -112,26 +112,20 @@ AM_CFLAGS = \
     $(GLIB_CFLAGS) \
     $(TP_GLIB_CFLAGS)
 
-TESTS_ENV = \
+TESTS_ENVIRONMENT = \
     abs_top_builddir=@abs_top_builddir@ \
     XDG_DATA_HOME=@abs_builddir@ \
     XDG_DATA_DIRS=@abs_srcdir@ \
     G_DEBUG=fatal_warnings,fatal_criticals
 
-TESTS_ENVIRONMENT = \
-    $(TESTS_ENV) \
-    sh $(top_srcdir)/tools/with-session-bus.sh --session --
-
 check-valgrind:
 	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		TESTS="$(TESTS:%=.libs/%)"
+		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)"
 
 VALGRIND_TESTS_ENVIRONMENT = \
     G_SLICE=always-malloc \
-    $(TESTS_ENV) \
-    $(top_builddir)/tools/telepathy-glib-env \
-    sh $(top_srcdir)/tools/with-session-bus.sh --session -- \
+    $(TESTS_ENVIRONMENT) \
+    $(top_builddir)/libtool --mode=execute \
     valgrind --tool=memcheck --leak-check=full --show-reachable=yes \
         --suppressions=$(top_srcdir)/examples/tp-glib-examples.supp \
         --child-silent-after-fork=yes --num-callers=20 --error-exitcode=42 \
-- 
1.5.6.5