diff --git a/debian/changelog b/debian/changelog index 376697b9c6..445389f8a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,9 @@ gtk+3.0 (3.24.0-4) UNRELEASED; urgency=medium - Install them in gtk-3-examples for now to avoid the NEW queue * d/p/no-accessibility-dump.patch: Drop, no longer needed. The build-time tests correctly set GTK_CSD=1 now. + * Stop marking some reftests as known failures. They now succeed on + all release architectures. + - d/p/reftest-known-fail.patch: Drop, no longer needed -- Simon McVittie Thu, 13 Sep 2018 08:29:08 +0100 diff --git a/debian/patches/reftest-known-fail.patch b/debian/patches/reftest-known-fail.patch deleted file mode 100644 index b2d28655de..0000000000 --- a/debian/patches/reftest-known-fail.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Michael Biebl -Date: Mon, 2 May 2016 01:18:04 +0200 -Subject: Mark known failing tests as non-fatal - -Forwarded: no ---- - testsuite/reftests/gtk-reftest.c | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 4930af8..69f906c 100644 ---- a/testsuite/reftests/gtk-reftest.c -+++ b/testsuite/reftests/gtk-reftest.c -@@ -253,6 +253,20 @@ save_image (cairo_surface_t *surface, - 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) - { -@@ -285,7 +299,13 @@ test_ui_file (GFile *file) - 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); diff --git a/debian/patches/series b/debian/patches/series index 2f0cbc6326..f16fd05579 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,5 +9,4 @@ Add-a-missing-include.patch 018_gdkenumtypes.c_location.patch 022_disable-viqr-im-for-vi-locale.patch 060_ignore-random-icons.patch -reftest-known-fail.patch Don-t-test-default-constructed-GdkPixbuf-properties.patch diff --git a/debian/rules b/debian/rules index 87ca4c0e8b..100e0cbce0 100755 --- a/debian/rules +++ b/debian/rules @@ -137,7 +137,6 @@ override_dh_clean: debian/control # gross kludge to force control generation with the %.in target touch debian/control.in rm -f $(call dh_subst_files,$(binaries)) - rm -f testsuite/reftests/*.ui.known_fail rm -rf debian/build debian/install # The build system does not automatically update the GResource files # when resources change. Force an update in case we ship a patch which @@ -174,11 +173,6 @@ ifneq ($(filter %-udeb,$(binaries)),) endif override_dh_auto_test: - # Mark reftests with known failures as non-fatal - touch testsuite/reftests/nonresizable-size.ui.known_fail - touch testsuite/reftests/window-show-contents-on-map.ui.known_fail - touch testsuite/reftests/inherit-and-initial.ui.known_fail - 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/