r53413 - in /desktop/unstable/epiphany-browser/debian: changelog control.in patches/disable-tests.patch patches/series rules

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Sun Sep  3 17:21:40 2017
New Revision: 53413

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53413
Log:
Run the build tests that don't require compiled gsettings schemas

Added:
    desktop/unstable/epiphany-browser/debian/patches/disable-tests.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/control.in
    desktop/unstable/epiphany-browser/debian/patches/series
    desktop/unstable/epiphany-browser/debian/rules

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=53413&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog	[utf-8] Sun Sep  3 17:21:40 2017
@@ -9,6 +9,11 @@
   * debian/control.in:
     - Bump glib2.0 to >= 2.46.0 and webkit2gtk to >= 2.17.4
     - Build-depend on libnettle-dev
+    - Build-depend on xauth and xvfb for build tests
+  * Add disable-tests.patch:
+    - Disable the tests that require compiled gsettings schemas
+  * debian/rules:
+    - Run the remaining build tests
   * Rebase 00_epiphany-browser.patch
 
  -- Laurent Bigonville <bigon at debian.org>  Fri, 01 Sep 2017 14:02:19 +0200

Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=53413&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in	[utf-8] Sun Sep  3 17:21:40 2017
@@ -28,6 +28,8 @@
                iso-codes (>= 0.35),
                itstool,
                gtk-doc-tools (>= 1.0),
+               xauth <!nocheck>,
+               xvfb <!nocheck>,
                appstream-util
 Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc
 Standards-Version: 4.1.0

Added: desktop/unstable/epiphany-browser/debian/patches/disable-tests.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/disable-tests.patch?rev=53413&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/disable-tests.patch	(added)
+++ desktop/unstable/epiphany-browser/debian/patches/disable-tests.patch	[utf-8] Sun Sep  3 17:21:40 2017
@@ -0,0 +1,43 @@
+Description: Disable test that require compiled gsettings schemas
+Author: Jeremy Bicha <jbicha at ubuntu.com>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=782246
+---
+ tests/meson.build |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -14,7 +14,7 @@ if get_option('enable_unit_tests')
+     'ephy-completion-model-test.c',
+     dependencies: ephymain_dep
+   )
+-  test('Completion model test', completion_model_test)
++  # test('Completion model test', completion_model_test)
+ 
+   # FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=778153
+   # download_test = executable('test-ephy-download',
+@@ -34,13 +34,13 @@ if get_option('enable_unit_tests')
+     'ephy-embed-utils-test.c',
+     dependencies: ephymain_dep
+   )
+-  test('Embed utils test', embed_utils_test)
++  # test('Embed utils test', embed_utils_test)
+ 
+   encodings_test = executable('test-ephy-encodings',
+     'ephy-encodings-test.c',
+     dependencies: ephymain_dep
+   )
+-  test('Encodings test', encodings_test)
++  # test('Encodings test', encodings_test)
+ 
+   # https://bugzilla.gnome.org/show_bug.cgi?id=786001
+   # file_helpers_test = executable('test-ephy-file-helpers',
+@@ -65,7 +65,7 @@ if get_option('enable_unit_tests')
+     'ephy-migration-test.c',
+     dependencies: ephymain_dep
+   )
+-  test('Migration test', migration_test)
++  # test('Migration test', migration_test)
+ 
+   # FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=707220
+   # session_test = executable('test-ephy-session',

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=53413&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series	[utf-8] Sun Sep  3 17:21:40 2017
@@ -1,2 +1,3 @@
 00_epiphany-browser.patch
 07_bookmarks.patch
+disable-tests.patch

Modified: desktop/unstable/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/rules?rev=53413&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/rules	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/rules	[utf-8] Sun Sep  3 17:21:40 2017
@@ -28,3 +28,4 @@
 	    debian/branding.conf.in > debian/epiphany-browser-data/usr/share/epiphany-browser/branding.conf
 
 override_dh_auto_test:
+	xvfb-run -a dh_auto_test