summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2010-12-10 10:48:53 (GMT)
committerJonny Lamb <jonny.lamb@collabora.co.uk>2010-12-10 10:55:16 (GMT)
commit52465001debd4c2763017f310bf8318a3caaefc5 (patch)
tree20ceb1f681e8d4fba6332c191bb66e600c24ef91
parent72fb9963b5333f6405cc485fc22434d6f512b3fc (diff)
downloadtelepathy-gabble-52465001debd4c2763017f310bf8318a3caaefc5.tar.gz
telepathy-gabble-52465001debd4c2763017f310bf8318a3caaefc5.tar.xz
tests: add GABBLE_TEST_BUSTLE env option
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--.gitignore1
-rw-r--r--tests/README3
-rw-r--r--tests/twisted/tools/with-session-bus.sh5
3 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 6680240..7cd79c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,4 @@ cscope.out
/tests/twisted/tools/*.service
/tests/twisted/with-session-bus-*.pid
/tests/twisted/with-session-bus-*.address
+/tests/twisted/tools/with-session-bus-*.bustle-logs
diff --git a/tests/README b/tests/README
index c9da6a5..68b9565 100644
--- a/tests/README
+++ b/tests/README
@@ -73,6 +73,9 @@ To debug an individual test you can set one of the following env variable:
to tools/strace.log.
export GABBLE_TEST_STRACE=1
+ * GABBLE_TEST_BUSTLE : to run bustle-dbus-monitor in the temporary
+ bus daemon. The logs are saved to tools/*bustle-logs.
+ export GABBLE_TEST_BUSTLE=1
== Jingle tests ==
diff --git a/tests/twisted/tools/with-session-bus.sh b/tests/twisted/tools/with-session-bus.sh
index 063bd7e..17f3ade 100644
--- a/tests/twisted/tools/with-session-bus.sh
+++ b/tests/twisted/tools/with-session-bus.sh
@@ -82,6 +82,11 @@ if [ -n "$WITH_SESSION_BUS_FORK_DBUS_MONITOR" ] ; then
> $me-$$.dbus-monitor-logs 2>&1 &
fi
+if [ -n "$GABBLE_TEST_BUSTLE" ]; then
+ echo "Forking bustle-dbus-monitor" >&2
+ bustle-dbus-monitor > tools/$me-$$.bustle-logs 2>&1 &
+fi
+
"$@" || e=$?
if test $sleep != 0; then