diff --git a/0002-Test-eshell-test-subcommand-reset-in-pipeline-is-uns.patch b/0002-Test-eshell-test-subcommand-reset-in-pipeline-is-uns.patch new file mode 100644 index 0000000..94b83bf --- /dev/null +++ b/0002-Test-eshell-test-subcommand-reset-in-pipeline-is-uns.patch @@ -0,0 +1,25 @@ +From 8ae158173d1d748d55e2605c04d33a95739e055c Mon Sep 17 00:00:00 2001 +From: Peter Oliver +Date: Mon, 15 Jul 2024 16:17:38 +0100 +Subject: [PATCH 2/3] Test eshell-test/subcommand-reset-in-pipeline is unstable + +Could be related to https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65602 +--- + test/lisp/eshell/eshell-tests.el | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/lisp/eshell/eshell-tests.el b/test/lisp/eshell/eshell-tests.el +index 3812a4117ac..8c13d4af237 100644 +--- a/test/lisp/eshell/eshell-tests.el ++++ b/test/lisp/eshell/eshell-tests.el +@@ -79,6 +79,7 @@ eshell-test/pipe-subcommand-with-pipe + + (ert-deftest eshell-test/subcommand-reset-in-pipeline () + "Check that subcommands reset `eshell-in-pipeline-p'." ++ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) + (skip-unless (executable-find "cat")) + (dolist (template '("echo {%s} | *cat" + "echo ${%s} | *cat" +-- +2.45.2 + diff --git a/0003-Mark-multiple-mml-sec-tests-as-unstable-when-built-i.patch b/0003-Mark-multiple-mml-sec-tests-as-unstable-when-built-i.patch new file mode 100644 index 0000000..397cbf1 --- /dev/null +++ b/0003-Mark-multiple-mml-sec-tests-as-unstable-when-built-i.patch @@ -0,0 +1,44 @@ +From 7beb6f67c68f110bf91324bdaafb2cbd22d9f814 Mon Sep 17 00:00:00 2001 +From: Peter Oliver +Date: Mon, 15 Jul 2024 16:19:10 +0100 +Subject: [PATCH 3/3] Mark multiple mml-sec tests as unstable when built in an + RPM + +* test/lisp/gnus/mml-sec-tests.el: Mark unstable tests which have been +seen to intermittently fail at +https://koji.fedoraproject.org/koji/packageinfo?packageID=560 +--- + test/lisp/gnus/mml-sec-tests.el | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el +index 7abd1bd65a3..1d83ec98ed8 100644 +--- a/test/lisp/gnus/mml-sec-tests.el ++++ b/test/lisp/gnus/mml-sec-tests.el +@@ -278,6 +278,7 @@ mml-secure-key-checks + + (ert-deftest mml-secure-find-usable-keys-1 () + "Make sure that expired and disabled keys and revoked UIDs are not used." ++ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) + (skip-unless (test-conf)) + (mml-secure-test-fixture + (lambda () +@@ -581,6 +582,7 @@ mml-secure-test-en-decrypt-with-passphrase + (ert-deftest mml-secure-en-decrypt-1 () + "Encrypt message; then decrypt and test for expected result. + In this test, the single matching key is chosen automatically." ++ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) + (skip-unless (test-conf)) + (dolist (method (enc-standards) nil) + ;; no-exp@example.org with single encryption key +@@ -625,6 +627,7 @@ mml-secure-en-decrypt-3 + (ert-deftest mml-secure-en-decrypt-4 () + "Encrypt message; then decrypt and test for expected result. + In this test, encrypt-to-self variables are set to lists." ++ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) + (skip-unless (test-conf)) + ;; Send from sub@example.org, which has two keys; encrypt to both. + (let ((mml-secure-openpgp-encrypt-to-self +-- +2.45.2 + diff --git a/emacs.spec b/emacs.spec index 1a68564..e0dece3 100644 --- a/emacs.spec +++ b/emacs.spec @@ -49,6 +49,10 @@ Patch: 0001-Fix-wdired-test-unfinished-edit-01-when-temp-dirname.patch # Fix intermittently failing test (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=72120) Patch: 0001-Fix-intermittent-failure-of-dired-test-bug27243-02.patch +# Skip intermittently failing tests +Patch: 0002-Test-eshell-test-subcommand-reset-in-pipeline-is-uns.patch +Patch: 0003-Mark-multiple-mml-sec-tests-as-unstable-when-built-i.patch + # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2276822 # (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63555). If GDK ever # gets any new backends, this patch may need extending.