r42156 - in /desktop/unstable/glib2.0/debian: changelog patches/05_run-gio-tests-with-a-dbus-session.patch patches/series rules tests/control tests/installed-tests

[smcv at users.alioth.debian.org]

Author: smcv
Date: Sun Aug 10 21:37:19 2014
New Revision: 42156

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42156
Log:
* Avoid using dbus-launch for regression tests (Closes: #737488):
  - run installed-tests under dbus-run-session from dbus (>= 1.8)
  - do not run build-time tests under dbus-launch: those that use D-Bus
    all create their own session bus instances now
    (i.e. remove 05_run-gio-tests-with-a-dbus-session.patch)
  - set a deliberately invalid DBUS_SESSION_BUS_ADDRESS to make sure
    nothing in the build is still inheriting it from the environment

Removed:
    desktop/unstable/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series
    desktop/unstable/glib2.0/debian/rules
    desktop/unstable/glib2.0/debian/tests/control
    desktop/unstable/glib2.0/debian/tests/installed-tests

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=42156&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog	[utf-8] Sun Aug 10 21:37:19 2014
@@ -25,6 +25,13 @@
     known to be turned off in the built binaries
   * Add patch from upstream to fix mis-optimization in gvariant test
     with gcc 4.9 (Closes: #756272)
+  * Avoid using dbus-launch for regression tests (Closes: #737488):
+    - run installed-tests under dbus-run-session from dbus (>= 1.8)
+    - do not run build-time tests under dbus-launch: those that use D-Bus
+      all create their own session bus instances now
+      (i.e. remove 05_run-gio-tests-with-a-dbus-session.patch)
+    - set a deliberately invalid DBUS_SESSION_BUS_ADDRESS to make sure
+      nothing in the build is still inheriting it from the environment
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 05 May 2014 11:50:10 +0200
 

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=42156&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series	[utf-8] Sun Aug 10 21:37:19 2014
@@ -2,7 +2,6 @@
 02_gettext-desktopfiles-ubuntu.patch
 03_disble_glib_compile_schemas_warning.patch
 04_homedir_env.patch
-05_run-gio-tests-with-a-dbus-session.patch
 06_thread_test_ignore_prctl_fail.patch
 07_disable_tests_on_slow_archs.patch
 10_kfreebsd_issetugid_prototype.patch

Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=42156&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules	[utf-8] Sun Aug 10 21:37:19 2014
@@ -63,6 +63,10 @@
 # Do not clutter $HOME with ~/.dbus-keyrings and avoid failure on the buildds
 # where creating /home/buildd/.dbus-keyrings fails
 export HOME=$(CURDIR)/debian/build
+
+# Make sure that everything that uses D-Bus is creating its own temporary
+# session rather than polluting the developer's (or failing, on buildds)
+export DBUS_SESSION_BUS_ADDRESS=this-should-not-be-used-and-will-fail:
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
   DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check -j1)

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

Modified: desktop/unstable/glib2.0/debian/tests/installed-tests
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/tests/installed-tests?rev=42156&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/tests/installed-tests	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/tests/installed-tests	[utf-8] Sun Aug 10 21:37:19 2014
@@ -7,4 +7,4 @@
 
 export XDG_RUNTIME_DIR=$ADTTMP
 
-dbus-launch xvfb-run -a gnome-desktop-testing-runner glib
+dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner glib