From 4b7db8692d58d8627805f4c45a1c2e885b46653c Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip@tecnocode.co.uk>
Date: Sun, 21 Oct 2012 12:24:10 +0100
Subject: [PATCH] =?utf8?q?Bug=20685250=20=E2=80=94=20make=20<test>.gdb=20d?=
 =?utf8?q?eadlocks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Always set CHECK_VERBOSE when running tests under gdb so that output (from
gdb) isn’t redirected to a log file. Apparently, headless gdb is hard to
use.

Closes: https://bugzilla.gnome.org/show_bug.cgi?id=685250
---
 NEWS                        | 1 +
 check.mk                    | 1 +
 tests/tools/execute-test.sh | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index fd2f735..2088f02 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Bugs fixed:
 • Bug 682941 — API to configure input of aggregation
 • Bug 685084 — Add a folks backend for ofono phonebook
 • Bug 686056 — Add api to create and remove address books
+• Bug 685250 — make <test>.gdb deadlocks
 
 API changes:
 • Add Backend.enable_persona_store and disable_persona_store.
diff --git a/check.mk b/check.mk
index 34951c4..55ebf83 100644
--- a/check.mk
+++ b/check.mk
@@ -1,6 +1,7 @@
 # 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/tools/execute-test.sh b/tests/tools/execute-test.sh
index cb211aa..54b4e33 100755
--- a/tests/tools/execute-test.sh
+++ b/tests/tools/execute-test.sh
@@ -19,7 +19,9 @@ fi
 
 # if exit code is 0, check for skipped tests
 if test z$e = z0; then
-  grep -i skipped capture-$$.log || true
+  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
-- 
2.7.4