diff --git a/debian/changelog b/debian/changelog index 134b0e48af..5aea449752 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,15 @@ gtk+3.0 (3.14.1-1) UNRELEASED; urgency=medium * 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 Mon, 29 Sep 2014 23:17:18 +0200 gtk+3.0 (3.14.0-1) unstable; urgency=medium diff --git a/debian/patches/reftest-known-fail.patch b/debian/patches/reftest-known-fail.patch new file mode 100644 index 0000000000..47f440f1a8 --- /dev/null +++ b/debian/patches/reftest-known-fail.patch @@ -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); diff --git a/debian/patches/series b/debian/patches/series index 5ae7317ab2..72bf8c4cd3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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 diff --git a/debian/rules b/debian/rules index e40d6da8de..36962b840a 100644 --- a/debian/rules +++ b/debian/rules @@ -151,8 +151,10 @@ clean:: debian/control 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/