r45020 - in /desktop/experimental/gjs/debian: changelog control control.in patches/0001-tests-Run-under-Xvfb.patch patches/series rules tests/installed-tests

laney at users.alioth.debian.org laney at users.alioth.debian.org
Wed Jun 10 10:40:22 UTC 2015 

Author: laney
Date: Wed Jun 10 10:40:22 2015
New Revision: 45020

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45020
Log:
* debian/patches/0001-tests-Run-under-Xvfb.patch,
  debian/rules, debian/control{,.in}: Make the testsuite fatal again. Run it
  under Xvfb (cherry-picked from upstream bug #750688).
* debian/control{,.in}: Add missing test-dep on at-spi2-core - there's a
  warning if it can't be bus activated which fails the test.
* debian/tests/installed-tests: Filter out successful activation messages
  from the dbus daemon which come on stderr and fail the test unnecessarily.

Added:
    desktop/experimental/gjs/debian/patches/0001-tests-Run-under-Xvfb.patch
Modified:
    desktop/experimental/gjs/debian/changelog
    desktop/experimental/gjs/debian/control
    desktop/experimental/gjs/debian/control.in
    desktop/experimental/gjs/debian/patches/series
    desktop/experimental/gjs/debian/rules
    desktop/experimental/gjs/debian/tests/installed-tests

Modified: desktop/experimental/gjs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/changelog?rev=45020&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gjs/debian/changelog	[utf-8] Wed Jun 10 10:40:22 2015
@@ -9,6 +9,13 @@
   * debian/watch: Find unstable versions too.
   * debian/rules: Run dh_install with --fail-missing
   * debian/control{,.in}: Standards-Version → 3.9.6
+  * debian/patches/0001-tests-Run-under-Xvfb.patch,
+    debian/rules, debian/control{,.in}: Make the testsuite fatal again. Run it
+    under Xvfb (cherry-picked from upstream bug #750688).
+  * debian/control{,.in}: Add missing test-dep on at-spi2-core - there's a
+    warning if it can't be bus activated which fails the test.
+  * debian/tests/installed-tests: Filter out successful activation messages
+    from the dbus daemon which come on stderr and fail the test unnecessarily.
 
  -- Iain Lane <laney at debian.org>  Wed, 10 Jun 2015 10:00:51 +0100
 

Modified: desktop/experimental/gjs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/control?rev=45020&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/control	[utf-8] (original)
+++ desktop/experimental/gjs/debian/control	[utf-8] Wed Jun 10 10:40:22 2015
@@ -22,7 +22,10 @@
                dbus-x11,
                uuid-runtime,
                libgtk-3-dev,
-               libcairo2-dev
+               libcairo2-dev,
+# test deps
+               at-spi2-core,
+               xvfb
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/experimental/gjs
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/gjs
@@ -44,7 +47,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-gtk-3.0
+         gir1.2-gtk-3.0,
+         at-spi2-core
 Description: Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform
  libraries using the Javascript language. It's mainly based on the

Modified: desktop/experimental/gjs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/control.in?rev=45020&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gjs/debian/control.in	[utf-8] Wed Jun 10 10:40:22 2015
@@ -18,7 +18,10 @@
                dbus-x11,
                uuid-runtime,
                libgtk-3-dev,
-               libcairo2-dev
+               libcairo2-dev,
+# test deps
+               at-spi2-core,
+               xvfb
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/experimental/gjs
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/gjs
@@ -40,7 +43,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-gtk-3.0
+         gir1.2-gtk-3.0,
+         at-spi2-core
 Description: Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform
  libraries using the Javascript language. It's mainly based on the

Added: desktop/experimental/gjs/debian/patches/0001-tests-Run-under-Xvfb.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/patches/0001-tests-Run-under-Xvfb.patch?rev=45020&op=file
==============================================================================
--- desktop/experimental/gjs/debian/patches/0001-tests-Run-under-Xvfb.patch	(added)
+++ desktop/experimental/gjs/debian/patches/0001-tests-Run-under-Xvfb.patch	[utf-8] Wed Jun 10 10:40:22 2015
@@ -0,0 +1,45 @@
+From fa04a37eb28741ce659a766a1df2a6dd5802238e Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain at orangesquash.org.uk>
+Date: Wed, 10 Jun 2015 09:18:21 +0100
+Subject: [PATCH] tests: Run under Xvfb
+
+To isolate from the user's X session, and also so that we work properly
+in chroots or other minimal environments.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=750688
+---
+ Makefile-test.am | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile-test.am b/Makefile-test.am
+index b91840b..0fe4562 100644
+--- a/Makefile-test.am
++++ b/Makefile-test.am
+@@ -2,8 +2,23 @@ EXTRA_DIST += \
+ 	test/run-with-dbus \
+ 	test/test-bus.conf
+ 
++XVFB = Xvfb -ac -noreset -screen 0 1024x768x16
++XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
++   491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
++   991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
++  1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
++  9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
++  9995 9996 9997 9998 9999
++XVFB_START = \
++${XVFB} -help 2>/dev/null 1>&2 \
++    && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
++    && { ${XVFB} :$$XID -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
++           trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
++    || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
++    && DISPLAY=:$$XID && export DISPLAY
++
+ RUN_WITH_DBUS = ${top_srcdir}/test/run-with-dbus --session --system
+-GTESTER = ${TESTS_ENVIRONMENT} ${RUN_WITH_DBUS} gtester
++GTESTER = ${XVFB_START} && ${TESTS_ENVIRONMENT} ${RUN_WITH_DBUS} gtester
+ CLEANFILES += uninstalled-system-test-bus.conf uninstalled-test-bus.conf
+ clean-local: test-user-data-clean
+ 
+-- 
+2.1.4
+

Modified: desktop/experimental/gjs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/patches/series?rev=45020&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gjs/debian/patches/series	[utf-8] Wed Jun 10 10:40:22 2015
@@ -0,0 +1 @@
+0001-tests-Run-under-Xvfb.patch

Modified: desktop/experimental/gjs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/rules?rev=45020&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/rules	[utf-8] (original)
+++ desktop/experimental/gjs/debian/rules	[utf-8] Wed Jun 10 10:40:22 2015
@@ -15,7 +15,7 @@
 LIBMOZJS = $(shell objdump -p debian/tmp/usr/lib/libgjs.so | awk '$$1=="NEEDED" && $$2~/^libmozjs/ { print $$2 }' | sed s/\\.so\\./-/ )
 DEB_DH_MAKESHLIBS_ARGS_libgjs0e = -Xusr/lib/gjs-1.0/ -V'libgjs0e (>= $(DEB_UPSTREAM_VERSION)), libgjs0-$(LIBMOZJS)' -- -c4
 
-DEB_MAKE_CHECK_TARGET := check || true
+DEB_MAKE_CHECK_TARGET := check
 
 DEB_DH_INSTALL_ARGS := --fail-missing -X.la
 

Modified: desktop/experimental/gjs/debian/tests/installed-tests
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/tests/installed-tests?rev=45020&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/tests/installed-tests	[utf-8] (original)
+++ desktop/experimental/gjs/debian/tests/installed-tests	[utf-8] Wed Jun 10 10:40:22 2015
@@ -1,10 +1,11 @@
-#!/bin/sh
-# autopkgtest check: Run the installed-tests to verify glib works correctly
-# (C) 2013 Canonical Ltd.
+#!/bin/bash
+# autopkgtest check: Run the installed-tests to verify gjs works correctly
+# (C) 2013-2015 Canonical Ltd.
 # Author: Iain Lane <iain.lane at canonical.com>
 
 set -e
 
 export XDG_RUNTIME_DIR=$ADTTMP
 
-dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner gjs
+# dbus outputs activation messages to stderr which fails the test
+dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner gjs 2> >(grep -vE '^(Activating|Successfully activated)')>&2

More information about the pkg-gnome-commits mailing list