[folks] tests: Remove redundant execute-test.sh script

[Philip Withnall <pwithnall src gnome org>]

commit 919a6dc73ed9717f5d2696dcf1d753cb5a789851
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Nov 18 23:41:42 2013 +0000

    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).

 HACKING                                 |    5 +++--
 check.mk                                |    1 -
 tests/folks/Makefile.am                 |    4 ----
 tests/lib/telepathy/test-case.vala      |    5 +++++
 tests/libsocialweb/Makefile.am          |    4 ----
 tests/telepathy/Makefile.am             |    5 -----
 tests/tools/Makefile.am                 |    1 -
 tests/tools/execute-test.sh             |   30 ------------------------------
 tests/tools/with-session-bus-tracker.sh |    2 +-
 tests/tools/with-session-bus.sh         |    2 +-
 10 files changed, 10 insertions(+), 49 deletions(-)
---
diff --git a/HACKING b/HACKING
index 4aa83a9..71e7d5a 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 55ebf83..34951c4 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 a04e846..9fda574 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 54343c7..28ff908 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 02df9eb..f84c02c 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 645fdce..b65efd5 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 b74dcb4..11ab159 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/with-session-bus-tracker.sh b/tests/tools/with-session-bus-tracker.sh
index 11ad9c7..cf1a8f3 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 d8f8d9b..4358535 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