r42181 - in /desktop/experimental/glib2.0/debian: changelog tests/control tests/installed-tests

[laney at users.alioth.debian.org]

Author: laney
Date: Thu Aug 14 10:14:31 2014
New Revision: 42181

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42181
Log:
Make the installed tests still run dbus-launch if we don't have
dbus-run-session (i.e. if the installed dbus is << 1.8).

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/tests/control
    desktop/experimental/glib2.0/debian/tests/installed-tests

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=42181&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Thu Aug 14 10:14:31 2014
@@ -29,6 +29,8 @@
         nothing in the build is still inheriting it from the environment
     + Override Lintian false positive #733733: we build-depend on python:any
       but Lintian doesn't yet understand :any syntax
+  * Make the installed tests still run dbus-launch if we don't have
+    dbus-run-session (i.e. if the installed dbus is << 1.8).
 
  -- Iain Lane <laney at debian.org>  Wed, 16 Jul 2014 17:44:58 +0100
 

Modified: desktop/experimental/glib2.0/debian/tests/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/tests/control?rev=42181&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/tests/control	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/tests/control	[utf-8] Thu Aug 14 10:14:31 2014
@@ -2,4 +2,4 @@
 Depends: libglib2.0-dev, build-essential
 
 Tests: installed-tests
-Depends: libglib2.0-tests, dbus-x11, dbus (>= 1.8), xauth, xvfb, gnome-desktop-testing
+Depends: libglib2.0-tests, dbus-x11, dbus, xauth, xvfb, gnome-desktop-testing

Modified: desktop/experimental/glib2.0/debian/tests/installed-tests
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/tests/installed-tests?rev=42181&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/tests/installed-tests	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/tests/installed-tests	[utf-8] Thu Aug 14 10:14:31 2014
@@ -7,4 +7,8 @@
 
 export XDG_RUNTIME_DIR=$ADTTMP
 
-dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner glib
+if [ -x /usr/bin/dbus-run-session ]; then
+    dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner glib
+else
+    dbus-launch --exit-with-session xvfb-run -a gnome-desktop-testing-runner glib
+fi