diff options
author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-04-11 16:31:56 +0200 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-09-26 08:15:13 -0400 |
commit | bfb21c309bcae17f74a27ac9435b4cbbdf1be767 (patch) | |
tree | 33eb161869b045a8000d932d298853925b556372 /tools | |
parent | d6c2580681fa9e84b6375331babef7f4e3962875 (diff) | |
download | telepathy-glib-bfb21c309bcae17f74a27ac9435b4cbbdf1be767.tar.gz |
Port unit tests to g_test_dbus_up/down
https://bugs.freedesktop.org/show_bug.cgi?id=55761
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.am | 2 | ||||
-rwxr-xr-x | tools/with-session-bus.sh | 106 |
2 files changed, 0 insertions, 108 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 761ee03c3..0fd42f89c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -9,7 +9,6 @@ telepathy-glib-env: telepathy-glib-env.in Makefile if ENABLE_INSTALLED_TESTS toolsdir = @tpglibtestsdir@/tools tools_SCRIPTS = \ - with-session-bus.sh \ test-wrapper.sh \ libglibcodegen.py \ libtpcodegen.py \ @@ -44,7 +43,6 @@ EXTRA_DIST = \ telepathy-glib.supp \ telepathy-glib-env.in \ test-wrapper.sh \ - with-session-bus.sh \ xincludator.py CLEANFILES = libtpcodegen.pyc libtpcodegen.pyo libglibcodegen.pyc libglibcodegen.pyo $(noinst_SCRIPTS) diff --git a/tools/with-session-bus.sh b/tools/with-session-bus.sh deleted file mode 100755 index 0afa59321..000000000 --- a/tools/with-session-bus.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# with-session-bus.sh - run a program with a temporary D-Bus session daemon -# -# The canonical location of this program is the telepathy-glib tools/ -# directory, please synchronize any changes with that copy. -# -# 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. - -set -e - -me=with-session-bus - -dbus_daemon_args="--print-address=5 --print-pid=6 --fork" -sleep=0 - -usage () -{ - echo "usage: $me [options] -- program [program_options]" >&2 - echo "Requires write access to the current directory." >&2 - echo "" >&2 - echo "If \$WITH_SESSION_BUS_FORK_DBUS_MONITOR is set, fork dbus-monitor" >&2 - echo "with the arguments in \$WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT." >&2 - echo "The output of dbus-monitor is saved in $me-<pid>.dbus-monitor-logs" >&2 - exit 2 -} - -while test "z$1" != "z--"; do - case "$1" in - --sleep=*) - sleep="$1" - sleep="${sleep#--sleep=}" - shift - ;; - --session) - dbus_daemon_args="$dbus_daemon_args --session" - shift - ;; - --config-file=*) - # FIXME: assumes config file doesn't contain any special characters - dbus_daemon_args="$dbus_daemon_args $1" - shift - ;; - *) - usage - ;; - esac -done -shift -if test "z$1" = "z"; then usage; fi - -exec 5> $me-$$.address -exec 6> $me-$$.pid - -cleanup () -{ - pid=`head -n1 $me-$$.pid` - if test -n "$pid" ; then - if [ -n "$VERBOSE_TESTS" ]; then - echo "Killing temporary bus daemon: $pid" >&2 - fi - kill -INT "$pid" - fi - rm -f $me-$$.address - rm -f $me-$$.pid -} - -trap cleanup INT HUP TERM -dbus-daemon $dbus_daemon_args - -if [ -n "$VERBOSE_TESTS" ]; then - { echo -n "Temporary bus daemon is "; cat $me-$$.address; } >&2 - { echo -n "Temporary bus daemon PID is "; head -n1 $me-$$.pid; } >&2 -fi - -e=0 - -# These might be non-null when run from e.g. gnome-terminal 3.8, which uses -# an activatable service for its windows; we don't want to inherit them either -unset DBUS_STARTER_ADDRESS -unset DBUS_STARTER_BUS_TYPE - -DBUS_SESSION_BUS_ADDRESS="`cat $me-$$.address`" -export DBUS_SESSION_BUS_ADDRESS -DBUS_SESSION_BUS_PID="`cat $me-$$.pid`" -export DBUS_SESSION_BUS_PID - -if [ -n "$WITH_SESSION_BUS_FORK_DBUS_MONITOR" ] ; then - echo -n "Forking dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT" >&2 - dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT \ - > $me-$$.dbus-monitor-logs 2>&1 & -fi - -"$@" || e=$? - -if test $sleep != 0; then - sleep $sleep -fi - -trap - INT HUP TERM -cleanup - -exit $e |