r48456 - in /desktop/unstable/gtk+3.0/debian: changelog patches/disable-flaky-textview-margins-reftest.patch patches/reftest-known-fail.patch patches/series rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun May  1 23:13:29 2016
New Revision: 48456

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48456
Log:
* Restore debian/patches/reftest-known-fail.patch so we can mark known
  failing tests as non-fatal.
* Drop debian/patches/disable-flaky-textview-margins-reftest.patch and tag
  textview-margins.ui as known-fail.

Added:
    desktop/unstable/gtk+3.0/debian/patches/reftest-known-fail.patch
Removed:
    desktop/unstable/gtk+3.0/debian/patches/disable-flaky-textview-margins-reftest.patch
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/patches/series
    desktop/unstable/gtk+3.0/debian/rules

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=48456&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog	[utf-8] Sun May  1 23:13:29 2016
@@ -1,3 +1,12 @@
+gtk+3.0 (3.20.3-2) UNRELEASED; urgency=medium
+
+  * Restore debian/patches/reftest-known-fail.patch so we can mark known
+    failing tests as non-fatal.
+  * Drop debian/patches/disable-flaky-textview-margins-reftest.patch and tag
+    textview-margins.ui as known-fail.
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 02 May 2016 01:10:17 +0200
+
 gtk+3.0 (3.20.3-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/gtk+3.0/debian/patches/reftest-known-fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/reftest-known-fail.patch?rev=48456&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/reftest-known-fail.patch	(added)
+++ desktop/unstable/gtk+3.0/debian/patches/reftest-known-fail.patch	[utf-8] Sun May  1 23:13:29 2016
@@ -0,0 +1,38 @@
+--- a/testsuite/reftests/gtk-reftest.c
++++ b/testsuite/reftests/gtk-reftest.c
+@@ -247,6 +247,20 @@
+   g_free (filename);
+ }
+ 
++static gboolean
++known_fail(const char *test_name)
++{
++  char *filename = get_test_file (test_name, ".ui.known_fail", TRUE);
++
++  if (filename)
++    {
++      g_free (filename);
++      return TRUE;
++    }
++
++  return FALSE;
++}
++
+ static void
+ test_ui_file (GFile *file)
+ {
+@@ -279,7 +293,13 @@
+   if (diff_image)
+     {
+       save_image (diff_image, ui_file, ".diff.png");
+-      g_test_fail ();
++      if (known_fail(ui_file))
++        {
++          printf("KNOWN FAIL: ");
++          g_test_message ("KNOWN FAIL: %s", ui_file);
++        }
++      else
++        g_test_fail ();
+     }
+ 
+   remove_extra_css (provider);

Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=48456&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] Sun May  1 23:13:29 2016
@@ -7,4 +7,4 @@
 060_ignore-random-icons.patch
 071_fix-installation-of-HTML-images.patch
 no-accessibility-dump.patch
-disable-flaky-textview-margins-reftest.patch
+reftest-known-fail.patch

Modified: desktop/unstable/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/rules?rev=48456&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/rules	[utf-8] Sun May  1 23:13:29 2016
@@ -155,9 +155,12 @@
 	# gross kludge to force control generation with the %.in target
 	touch debian/control.in
 	rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES))
+	rm -f testsuite/reftests/*.ui.known_fail
 	rm -rf debian/build debian/install
 
 pre-build::
+	# Mark reftests with known failures as non-fatal
+	touch testsuite/reftests/textview-margins.ui.known_fail
 	# So that gsettings can find the (uninstalled) gtk schemas
 	mkdir -p debian/build/glib-2.0/schemas/
 	cp gtk/org.gtk.* debian/build/glib-2.0/schemas/