tests: Remove redundant execute-test.sh script

It was used to redirect verbose logging output to a log file, but automake
1.11 does that automatically now with its parallel test framework (which
folks has enabled).

10 files changed, 10 insertions, 49 deletions

diff --git a/HACKING b/HACKING
index 4aa83a9a..71e7d5ae 100644
--- a/HACKING
+++ b/HACKING
@@ -155,8 +155,9 @@ Then use gdb as normal.
 To run a single test:
         make -C tests/<dir> check TESTS=<test name>
 
-To run a single test with debugging output:
-        make -C tests/<dir> check TESTS=<test name> CHECK_VERBOSE=1
+Thanks to automake’s parallel test harness, the output from all tests is logged
+automatically to <test name>.log, so no additional options need to be provided
+to force verbose output.
 
 If a test needs to be run through Valgrind for memory debugging, use:
         make -C tests/<dir> check TESTS=<test name> FOLKS_TEST_VALGRIND=1
diff --git a/check.mk b/check.mk
index 55ebf836..34951c41 100644
--- a/check.mk
+++ b/check.mk
@@ -1,7 +1,6 @@
 # taken from gstreamer
 # gdb any given test by running make test.gdb
 %.gdb: %
-	CHECK_VERBOSE=1 \
 	$(TESTS_ENVIRONMENT) \
 	$(LIBTOOL) --mode=execute \
 	gdb $*
diff --git a/tests/folks/Makefile.am b/tests/folks/Makefile.am
index a04e8461..9fda5745 100644
--- a/tests/folks/Makefile.am
+++ b/tests/folks/Makefile.am
@@ -54,10 +54,6 @@ noinst_PROGRAMS = \
 	init \
 	$(NULL)
 
-TESTS_ENVIRONMENT = \
-	$(top_srcdir)/tests/tools/execute-test.sh \
-	$(NULL)
-
 TESTS = $(noinst_PROGRAMS)
 
 backend_loading_SOURCES = \
diff --git a/tests/lib/telepathy/test-case.vala b/tests/lib/telepathy/test-case.vala
index 54343c76..28ff908d 100644
--- a/tests/lib/telepathy/test-case.vala
+++ b/tests/lib/telepathy/test-case.vala
@@ -129,6 +129,11 @@ public class TpfTest.TestCase : Folks.TestCase
    */
   public virtual void create_kf_backend ()
     {
+      /* Default key-file backend file to load. */
+      Environment.set_variable ("FOLKS_BACKEND_KEY_FILE_PATH",
+          Folks.BuildConf.ABS_TOP_SRCDIR + "/data/relationships-empty.ini",
+          true);
+
       if (use_keyfile_too)
         this.kf_backend = new KfTest.Backend ();
     }
diff --git a/tests/libsocialweb/Makefile.am b/tests/libsocialweb/Makefile.am
index 02df9eb5..f84c02c1 100644
--- a/tests/libsocialweb/Makefile.am
+++ b/tests/libsocialweb/Makefile.am
@@ -36,10 +36,6 @@ noinst_PROGRAMS = \
 	aggregation \
 	$(NULL)
 
-TESTS_ENVIRONMENT = \
-	$(top_srcdir)/tests/tools/execute-test.sh \
-	$(NULL)
-
 TESTS = $(noinst_PROGRAMS)
 
 dummy_lsw_SOURCES = \
diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am
index 645fdcee..b65efd5f 100644
--- a/tests/telepathy/Makefile.am
+++ b/tests/telepathy/Makefile.am
@@ -43,11 +43,6 @@ LDADD = \
 	-L$(top_srcdir)/backends/telepathy/lib \
 	$(NULL)
 
-TESTS_ENVIRONMENT = \
-	FOLKS_BACKEND_KEY_FILE_PATH=$(srcdir)/data/relationships-empty.ini \
-	$(top_srcdir)/tests/tools/execute-test.sh \
-	$(NULL)
-
 TESTS = \
 	persona-store-capabilities \
 	individual-retrieval \
diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index b74dcb4c..11ab1593 100644
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -1,5 +1,4 @@
 EXTRA_DIST = \
-	execute-test.sh \
 	with-session-bus.sh \
 	dbus-session.sh \
 	manager-file.py \
diff --git a/tests/tools/execute-test.sh b/tests/tools/execute-test.sh
deleted file mode 100755
index 54b4e33d..00000000
--- a/tests/tools/execute-test.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# with-session-bus.sh - run a program with a temporary D-Bus session daemon
-#
-# interesting bits have been move into dbus to permit reusability
-#
-# Copyright (C) 2007-2008 Collabora Ltd. <http://www.collabora.co.uk/>
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-e=0
-
-if test -t 1 && test "z$CHECK_VERBOSE" != z; then
-  "$@" || e=$?
-else
-  "$@" > capture-$$.log 2>&1 || e=$?
-fi
-
-# if exit code is 0, check for skipped tests
-if test z$e = z0; then
-  if test -f capture-$$.log; then
-    grep -i skipped capture-$$.log || true
-  fi
-  rm -f capture-$$.log
-# exit code is not 0, so output log and exit
-else
-  cat capture-$$.log
-  exit $e
-fi
diff --git a/tests/tools/with-session-bus-tracker.sh b/tests/tools/with-session-bus-tracker.sh
index 11ad9c79..cf1a8f38 100755
--- a/tests/tools/with-session-bus-tracker.sh
+++ b/tests/tools/with-session-bus-tracker.sh
@@ -40,7 +40,7 @@ FOLKS_TESTS_SANDBOXED_DBUS=tracker
 export FOLKS_TESTS_SANDBOXED_DBUS
 
 e=0
-$cur_dir"/execute-test.sh" "$@" || e=$?
+"$@" || e=$?
 
 trap - INT HUP TERM
 cleanup
diff --git a/tests/tools/with-session-bus.sh b/tests/tools/with-session-bus.sh
index d8f8d9b4..43585350 100755
--- a/tests/tools/with-session-bus.sh
+++ b/tests/tools/with-session-bus.sh
@@ -34,7 +34,7 @@ dbus_start
 FOLKS_TESTS_SANDBOXED_DBUS=no-services
 export FOLKS_TESTS_SANDBOXED_DBUS
 
-$cur_dir"/execute-test.sh" "$@" || e=$?
+"$@" || e=$?
 
 trap - INT HUP TERM
 cleanup