r43334 - in /desktop/unstable/gtk+3.0/debian: changelog patches/reftest-known-fail.patch patches/series rules

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Oct  1 19:22:42 2014
New Revision: 43334

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43334
Log:
* Add debian/patches/reftest-known-fail.patch
  - make it possible to tag individual reftests as ok to fail.
* debian/rules:
  touch testsuite/reftests/style-properties-nth-child.ui.known_fail
  - reftest shows this intermittently has a couple of pixels
    difference on some architectures. No big deal.
    Noone is willing to investigate and consensus is it's ok to disable.

Added:
    desktop/unstable/gtk+3.0/debian/patches/reftest-known-fail.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=43334&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog	[utf-8] Wed Oct  1 19:22:42 2014
@@ -12,6 +12,15 @@
   * New upstream release.
   * debian/patches/080-reftest-Add-missing-include-of-reftest-snapshot.h.patch:
     + Dropped, merged upstream.
+
+  [ Andreas Henriksson ]
+  * Add debian/patches/reftest-known-fail.patch
+    - make it possible to tag individual reftests as ok to fail.
+  * debian/rules:
+    touch testsuite/reftests/style-properties-nth-child.ui.known_fail
+    - reftest shows this intermittently has a couple of pixels
+      difference on some architectures. No big deal.
+      Noone is willing to investigate and consensus is it's ok to disable.
 
  -- Sjoerd Simons <sjoerd at debian.org>  Mon, 29 Sep 2014 23:17:18 +0200
 

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=43334&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] Wed Oct  1 19:22:42 2014
@@ -0,0 +1,38 @@
+--- a/testsuite/reftests/gtk-reftest.c
++++ b/testsuite/reftests/gtk-reftest.c
+@@ -230,6 +230,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)
+ {
+@@ -261,7 +275,13 @@
+   if (diff_image)
+     {
+       save_image (diff_image, ui_file, ".diff.png");
+-      g_test_fail ();
++      if (known_fail(ui_file))
++        {
++          printf("KNOWN FAILURE - %s\n", ui_file);
++          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=43334&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] Wed Oct  1 19:22:42 2014
@@ -11,3 +11,4 @@
 060_ignore-random-icons.patch
 061_multiarch_module_fallback.patch
 071_fix-installation-of-HTML-images.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=43334&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/rules	[utf-8] Wed Oct  1 19:22:42 2014
@@ -151,8 +151,10 @@
 	touch debian/control.in
 	rm -f $(call dh_subst_files,$(DEB_ALL_PACKAGES))
 
-# So that gsettings can find the (uninstalled) gtk schemas
 pre-build::
+	# Mark reftests with known failures as non-fatal
+	touch testsuite/reftests/style-properties-nth-child.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/
 	glib-compile-schemas debian/build/glib-2.0/schemas/