r53235 - in /desktop/experimental/gnome-shell/debian: changelog control control.in patches/run-unit-tests.patch patches/series rules
jbicha at users.alioth.debian.org
jbicha at users.alioth.debian.org
Thu Aug 31 11:27:39 UTC 2017
Author: jbicha
Date: Thu Aug 31 11:27:38 2017
New Revision: 53235
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53235
Log:
Run unit tests with meson
Added:
desktop/experimental/gnome-shell/debian/patches/run-unit-tests.patch
Modified:
desktop/experimental/gnome-shell/debian/changelog
desktop/experimental/gnome-shell/debian/control
desktop/experimental/gnome-shell/debian/control.in
desktop/experimental/gnome-shell/debian/patches/series
desktop/experimental/gnome-shell/debian/rules
Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=53235&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog [utf-8] Thu Aug 31 11:27:38 2017
@@ -10,6 +10,7 @@
- Depend on caribou (LP: #1589240)
- Recommend chrome-gnome-shell
- Recommend switcheroo-control for dual GPU support
+ * Add run-unit-tests.patch: Run unit tests with meson
* Drop 3.14 upgrade hack, not needed after stretch
* Drop 50-extension-reload-fail.patch: applied in new release
Modified: desktop/experimental/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control?rev=53235&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control [utf-8] Thu Aug 31 11:27:38 2017
@@ -6,8 +6,8 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Jeremy Bicha <jbicha at ubuntu.com>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 10),
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
+Build-Depends: debhelper (>= 10.3~),
gnome-control-center-dev (>= 1:3.4),
gnome-pkg-tools (>= 0.11),
gettext,
@@ -46,7 +46,16 @@
libxfixes-dev,
libxml2-dev,
mesa-common-dev,
+ meson (>= 0.42),
python3,
+ gir1.2-accountsservice-1.0 <!nocheck>,
+ gir1.2-caribou-1.0 (>= 0.4.8) <!nocheck>,
+ gir1.2-gdm-1.0 (>= 3.18.2) <!nocheck>,
+ gir1.2-geoclue-2.0 <!nocheck>,
+ gir1.2-gweather-3.0 <!nocheck>,
+ gir1.2-rsvg-2.0 <!nocheck>,
+ xauth <!nocheck>,
+ xvfb <!nocheck>
Standards-Version: 3.9.8
Homepage: https://wiki.gnome.org/Projects/GnomeShell
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell
Modified: desktop/experimental/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control.in?rev=53235&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control.in [utf-8] Thu Aug 31 11:27:38 2017
@@ -44,6 +44,14 @@
mesa-common-dev,
meson (>= 0.42),
python3,
+ gir1.2-accountsservice-1.0 <!nocheck>,
+ gir1.2-caribou-1.0 (>= 0.4.8) <!nocheck>,
+ gir1.2-gdm-1.0 (>= 3.18.2) <!nocheck>,
+ gir1.2-geoclue-2.0 <!nocheck>,
+ gir1.2-gweather-3.0 <!nocheck>,
+ gir1.2-rsvg-2.0 <!nocheck>,
+ xauth <!nocheck>,
+ xvfb <!nocheck>
Standards-Version: 3.9.8
Homepage: https://wiki.gnome.org/Projects/GnomeShell
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell
Added: desktop/experimental/gnome-shell/debian/patches/run-unit-tests.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/run-unit-tests.patch?rev=53235&op=file
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/run-unit-tests.patch (added)
+++ desktop/experimental/gnome-shell/debian/patches/run-unit-tests.patch [utf-8] Thu Aug 31 11:27:38 2017
@@ -0,0 +1,75 @@
+From 6e6b85af034bb5bf963b6571b4164d5c2b00b8d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Sat, 19 Aug 2017 10:43:38 +0200
+Subject: [PATCH] build: Run unit tests on `meson test`
+
+Meson makes it easy to define unit tests, so hook up the existing
+ones.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=786497
+---
+ data/meson.build | 9 ++++++++-
+ tests/meson.build | 25 ++++++++++++++++++++++++-
+ 2 files changed, 32 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 6bc5ae08a..032e3f0f4 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -78,11 +78,18 @@ install_data('50-gnome-shell-system.xml', install_dir: keysdir)
+
+ schemaconf = configuration_data()
+ schemaconf.set('GETTEXT_PACKAGE', meson.project_name())
+-configure_file(
++schema = configure_file(
+ input: 'org.gnome.shell.gschema.xml.in',
+ output: 'org.gnome.shell.gschema.xml',
+ configuration: schemaconf,
+ install_dir: schemadir
+ )
+
++# for unit tests - gnome.compile_schemas() only looks in srcdir
++custom_target('compile-schemas',
++ input: schema,
++ output: 'gschemas.compiled',
++ command: [find_program('glib-compile-schemas'), meson.current_build_dir()],
++ build_by_default: true)
++
+ install_data('gnome-shell-overrides.convert', install_dir: convertdir)
+diff --git a/tests/meson.build b/tests/meson.build
+index 91f9cda15..c7670fd89 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -1,8 +1,31 @@
+ testconf = configuration_data()
+ testconf.set('MUTTER_TYPELIB_DIR', mutter_typelibdir)
+ testconf.set('srcdir', meson.current_source_dir())
+-configure_file(
++run_test = configure_file(
+ input: 'run-test.sh.in',
+ output: 'run-test.sh',
+ configuration: testconf
+ )
++
++testenv = environment()
++testenv.set('GSETTINGS_SCHEMA_DIR', join_paths(meson.build_root(), 'data'))
++
++test('insertSorted', run_test,
++ args: 'unit/insertSorted.js',
++ env: testenv,
++ workdir: meson.current_source_dir())
++
++test('jsParse', run_test,
++ args: 'unit/jsParse.js',
++ env: testenv,
++ workdir: meson.current_source_dir())
++
++test('markup', run_test,
++ args: 'unit/markup.js',
++ env: testenv,
++ workdir: meson.current_source_dir())
++
++test('url', run_test,
++ args: 'unit/url.js',
++ env: testenv,
++ workdir: meson.current_source_dir())
Modified: desktop/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=53235&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series [utf-8] Thu Aug 31 11:27:38 2017
@@ -1,3 +1,4 @@
27-nm-libexec-path.patch
#30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
41-handle-logind-fail.patch
+run-unit-tests.patch
Modified: desktop/experimental/gnome-shell/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/rules?rev=53235&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/rules [utf-8] Thu Aug 31 11:27:38 2017
@@ -41,3 +41,6 @@
override_dh_gencontrol:
dh_gencontrol -- -Vicon-theme:Depends=adwaita-icon-theme-full
endif
+
+override_dh_auto_test:
+ xvfb-run dh_auto_test
More information about the pkg-gnome-commits
mailing list