From 1852414bace0e3a9cf37cb8d2cda822f18067a35 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jeremy=20B=C3=ADcha?= Date: Tue, 8 Aug 2023 14:50:55 -0400 Subject: [PATCH] Add patch to mark headless tests as flaky --- debian/patches/series | 1 + .../tests-mark-headless-tests-as-flaky.patch | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 debian/patches/tests-mark-headless-tests-as-flaky.patch diff --git a/debian/patches/series b/debian/patches/series index 8e7f46fa01..fe9fd70651 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,7 @@ Revert-tests-Stop-copying-the-tool-tests.patch Revert-build-Drop-the-install-tests-option.patch print-Revert-Start-sorting-apart-includes-change-for-gtkp.patch test-calendar-Update-timezone-name.patch +tests-mark-headless-tests-as-flaky.patch debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch debian/reftests-Allow-minor-differences-to-be-tolerated.patch debian/Disable-inscription-markup.ui-reftest.patch diff --git a/debian/patches/tests-mark-headless-tests-as-flaky.patch b/debian/patches/tests-mark-headless-tests-as-flaky.patch new file mode 100644 index 0000000000..8846e7a49c --- /dev/null +++ b/debian/patches/tests-mark-headless-tests-as-flaky.patch @@ -0,0 +1,29 @@ +From: =?utf-8?q?Jeremy_B=C3=ADcha?= +Date: Tue, 8 Aug 2023 14:50:05 -0400 +Subject: tests: mark headless tests as flaky + +See baaa7482489b0f7446ef1e0130e527a169c43b0c +--- + testsuite/headless/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/testsuite/headless/meson.build b/testsuite/headless/meson.build +index 1c9b5f5..bec3de1 100644 +--- a/testsuite/headless/meson.build ++++ b/testsuite/headless/meson.build +@@ -11,13 +11,13 @@ env.prepend('MESON_CURRENT_BUILD_DIR', meson.current_build_dir()) + if get_option('b_sanitize') != 'address' + test('monitor', + find_program('run-headless-monitor-tests.sh', dirs: meson.current_source_dir()), +- suite: ['headless'], ++ suite: ['headless', 'flaky'], + env: env, + ) + + test('input', + find_program('run-headless-input-tests.sh', dirs: meson.current_source_dir()), +- suite: ['headless'], ++ suite: ['headless', 'flaky'], + env: env, + ) + endif -- 2.30.2