r50043 - in /desktop/unstable/pygobject/debian: changelog control control.in patches/03_tests-use-dbus-run-session-instead-of-dbus-launch.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sat Sep 3 16:35:12 UTC 2016
Author: biebl
Date: Sat Sep 3 16:35:12 2016
New Revision: 50043
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50043
Log:
Use dbus-run-session instead of dbus-launch to run the tests.
(Closes: #836049)
Added:
desktop/unstable/pygobject/debian/patches/03_tests-use-dbus-run-session-instead-of-dbus-launch.patch
Modified:
desktop/unstable/pygobject/debian/changelog
desktop/unstable/pygobject/debian/control
desktop/unstable/pygobject/debian/control.in
desktop/unstable/pygobject/debian/patches/series
Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=50043&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog [utf-8] Sat Sep 3 16:35:12 2016
@@ -2,6 +2,10 @@
[ Aurelien Jarno ]
* Fix wrong enum to hash conversion on 64-bit big endian. (Closes: #835413)
+
+ [ Michael Biebl ]
+ * Use dbus-run-session instead of dbus-launch to run the tests.
+ (Closes: #836049)
-- Michael Biebl <biebl at debian.org> Sat, 03 Sep 2016 15:50:04 +0200
Modified: desktop/unstable/pygobject/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control?rev=50043&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control [utf-8] (original)
+++ desktop/unstable/pygobject/debian/control [utf-8] Sat Sep 3 16:35:12 2016
@@ -6,7 +6,7 @@
Section: python
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.16.1~),
gnome-common,
@@ -25,7 +25,7 @@
xsltproc,
xvfb,
xauth,
- dbus-x11,
+ dbus (>= 1.8),
at-spi2-core,
locales,
docbook-xsl,
Modified: desktop/unstable/pygobject/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control.in?rev=50043&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control.in [utf-8] (original)
+++ desktop/unstable/pygobject/debian/control.in [utf-8] Sat Sep 3 16:35:12 2016
@@ -21,7 +21,7 @@
xsltproc,
xvfb,
xauth,
- dbus-x11,
+ dbus (>= 1.8),
at-spi2-core,
locales,
docbook-xsl,
Added: desktop/unstable/pygobject/debian/patches/03_tests-use-dbus-run-session-instead-of-dbus-launch.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/03_tests-use-dbus-run-session-instead-of-dbus-launch.patch?rev=50043&op=file
==============================================================================
--- desktop/unstable/pygobject/debian/patches/03_tests-use-dbus-run-session-instead-of-dbus-launch.patch (added)
+++ desktop/unstable/pygobject/debian/patches/03_tests-use-dbus-run-session-instead-of-dbus-launch.patch [utf-8] Sat Sep 3 16:35:12 2016
@@ -0,0 +1,48 @@
+From 4617c39ca212f0da82af1a9989c912bcdfe1158b Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Sat, 3 Sep 2016 16:46:40 +0200
+Subject: [PATCH] tests: use dbus-run-session instead of dbus-launch to run
+ tests
+
+The use of dbus-launch is deprecated by dbus upstream.
+See https://lists.debian.org/debian-devel/2016/08/msg00554.html for more
+details.
+
+So use dbus-run-session instead, which was specifically designed to be
+used for such cases, like running test-suites.
+
+See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=836049.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=770798
+---
+ tests/Makefile.am | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 233175c..3c907f1 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -135,7 +135,6 @@ EXTRA_DIST = \
+ clean-local:
+ rm -f $(check_LTLIBRARIES:.la=.$(OS_EXT)) file.txt~
+
+-DBUS_LAUNCH=$(shell which dbus-launch)
+ RUN_TESTS_ENV_VARS= \
+ PYTHONPATH=$(top_builddir):$(top_builddir)/tests:$${PYTHONPATH:+:$$PYTHONPATH} \
+ LD_LIBRARY_PATH=$(builddir)/.libs:$$LD_LIBRARY_PATH \
+@@ -149,10 +148,8 @@ RUN_TESTS_ENV_VARS= \
+ # pygtkcompat tests need to be run in a separate process as they
+ # clobber global name space
+ check-local: $(check_LTLIBRARIES:.la=.$(OS_EXT)) $(test_typelibs) gschemas.compiled
+- export `$(DBUS_LAUNCH)` && \
+- $(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd $(srcdir)/runtests.py; rc=$$?; \
+- [ "$$rc" -ne 0 ] || [ -n "$$TEST_NAMES" ] || { TEST_NAMES=compat_test_pygtk $(RUN_TESTS_ENV_VARS) $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning -Werror::RuntimeWarning $(srcdir)/runtests.py; rc=$$?; }; \
+- kill $$DBUS_SESSION_BUS_PID; \
++ $(RUN_TESTS_ENV_VARS) dbus-run-session -- $(EXEC_NAME) $(PYTHON) -Wd $(srcdir)/runtests.py; rc=$$?; \
++ [ "$$rc" -ne 0 ] || [ -n "$$TEST_NAMES" ] || { TEST_NAMES=compat_test_pygtk $(RUN_TESTS_ENV_VARS) dbus-run-session -- $(EXEC_NAME) $(PYTHON) -Wd -Werror::PendingDeprecationWarning -Werror::DeprecationWarning -Werror::RuntimeWarning $(srcdir)/runtests.py; rc=$$?; }; \
+ exit $$rc
+
+ check.gdb:
+--
+2.9.3
+
Modified: desktop/unstable/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/series?rev=50043&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/series [utf-8] (original)
+++ desktop/unstable/pygobject/debian/patches/series [utf-8] Sat Sep 3 16:35:12 2016
@@ -1,2 +1,3 @@
01_cairo_region.patch
02_Fix-list-hashtable-enum-hash-conversion-on-64-bit-bi.patch
+03_tests-use-dbus-run-session-instead-of-dbus-launch.patch
More information about the pkg-gnome-commits
mailing list