From: Simon McVittie Date: Tue, 22 Aug 2023 11:07:38 +0000 (+0100) Subject: Add patch to work around a test failure on riscv64 X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2^2~18 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=568655ab1848c820a9e98fb0c0bf2b27a0d38530;p=gtk4.git Add patch to work around a test failure on riscv64 Other architectures are occasionally affected by this. Thanks: Aurelien Jarno Closes: #1049434 --- diff --git a/debian/patches/Revert-build-Drop-the-install-tests-option.patch b/debian/patches/Revert-build-Drop-the-install-tests-option.patch index 45206ccdab..c077a3ffa3 100644 --- a/debian/patches/Revert-build-Drop-the-install-tests-option.patch +++ b/debian/patches/Revert-build-Drop-the-install-tests-option.patch @@ -22,7 +22,7 @@ This reverts commit 3121f88265ac61733e257f5335473d6f139f158c. 12 files changed, 353 insertions(+), 43 deletions(-) diff --git a/meson.build b/meson.build -index 1351771..33b95e5 100644 +index 948dc01..da59df5 100644 --- a/meson.build +++ b/meson.build @@ -902,6 +902,7 @@ summary('Documentation', get_option('gtk_doc'), section: 'Build') @@ -286,7 +286,7 @@ index 576b4d8..eb619cf 100644 + install_data(test_data, install_dir: testexecdir) +endif diff --git a/testsuite/css/parser/meson.build b/testsuite/css/parser/meson.build -index b419c29..d0fdd0d 100644 +index 4c13342..2b5547d 100644 --- a/testsuite/css/parser/meson.build +++ b/testsuite/css/parser/meson.build @@ -1,8 +1,11 @@ @@ -306,7 +306,7 @@ index b419c29..d0fdd0d 100644 test_data = [ 'animation-crash-3.12.css', -@@ -534,3 +537,15 @@ foreach testname : test_data +@@ -536,3 +539,15 @@ foreach testname : test_data suite: 'css') endif endforeach @@ -477,7 +477,7 @@ index ebaa66f..98b57cb 100644 + install_subdir('image-data', install_dir: testexecdir) +endif diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build -index ca8f833..44ad57a 100644 +index 3fe5295..2e1208e 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build @@ -1,12 +1,22 @@ @@ -505,7 +505,7 @@ index ca8f833..44ad57a 100644 ) compare_render_tests = [ -@@ -277,9 +287,11 @@ foreach t : tests +@@ -280,9 +290,11 @@ foreach t : tests test_extra_ldflags = t.get(3, []) test_exe = executable(test_name, test_srcs, @@ -518,7 +518,7 @@ index ca8f833..44ad57a 100644 ) test(test_name, test_exe, -@@ -308,11 +320,12 @@ foreach t : internal_tests +@@ -311,11 +323,12 @@ foreach t : internal_tests test_extra_cargs = t.get(2, []) test_extra_ldflags = t.get(3, []) @@ -535,7 +535,7 @@ index ca8f833..44ad57a 100644 test(test_name, test_exe, diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build -index 73dd136..3c107ef 100644 +index a581156..50cab1e 100644 --- a/testsuite/gtk/meson.build +++ b/testsuite/gtk/meson.build @@ -1,3 +1,6 @@ @@ -607,7 +607,7 @@ index 73dd136..3c107ef 100644 ) foreach test : focus_chain_tests -@@ -274,6 +296,30 @@ test('potfiles', make_pot, +@@ -275,6 +297,30 @@ test('potfiles', make_pot, workdir: meson.project_source_root(), suite: ['gtk', 'translations' ]) diff --git a/debian/patches/debian/Disable-inscription-markup.ui-reftest.patch b/debian/patches/debian/Disable-inscription-markup.ui-reftest.patch index 855565cc8c..94a36f2094 100644 --- a/debian/patches/debian/Disable-inscription-markup.ui-reftest.patch +++ b/debian/patches/debian/Disable-inscription-markup.ui-reftest.patch @@ -12,7 +12,7 @@ Forwarded: not-needed, workaround 1 file changed, 2 insertions(+) diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build -index 1cc8a43..47d0864 100644 +index fc76528..2c6887c 100644 --- a/testsuite/reftests/meson.build +++ b/testsuite/reftests/meson.build @@ -616,6 +616,8 @@ flaky = [ diff --git a/debian/patches/debian/tests-Allow-longer-for-a-dialog-to-open.patch b/debian/patches/debian/tests-Allow-longer-for-a-dialog-to-open.patch new file mode 100644 index 0000000000..1ea562d825 --- /dev/null +++ b/debian/patches/debian/tests-Allow-longer-for-a-dialog-to-open.patch @@ -0,0 +1,26 @@ +From: Simon McVittie +Date: Tue, 22 Aug 2023 12:05:31 +0100 +Subject: tests: Allow longer for a dialog to open + +This hopefully makes the test pass more reliably, especially on riscv64. + +Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/6050 +Bug-Debian: https://bugs.debian.org/1049434 +Forwarded: no, workaround +--- + testsuite/gtk/templates.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testsuite/gtk/templates.c b/testsuite/gtk/templates.c +index 6de199a..03a432d 100644 +--- a/testsuite/gtk/templates.c ++++ b/testsuite/gtk/templates.c +@@ -41,7 +41,7 @@ show_and_wait (GtkWidget *widget) + { + gboolean done = FALSE; + +- g_timeout_add (500, main_loop_quit_cb, &done); ++ g_timeout_add (1500, main_loop_quit_cb, &done); + gtk_widget_set_visible (widget, TRUE); + while (!done) + g_main_context_iteration (NULL, FALSE); diff --git a/debian/patches/series b/debian/patches/series index fc3f33fb0d..c0d78243d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ debian/subprojects-Add-gst-player-1.0-as-subporject.patch debian/gstreamer-player-1.0-Do-not-install-it-if-it-s-a-subproje.patch debian/media-Use-gstplayer-from-meson-subproject.patch debian/gstreamer-player-Use-GtkName-Prefix-to-avoid-issues-if-ac.patch +debian/tests-Allow-longer-for-a-dialog-to-open.patch