From df45480b916f387660d3986237f0f068f154f842 Mon Sep 17 00:00:00 2001
From: Peter Oliver <git@mavit.org.uk>
Date: Jul 11 2024 16:49:33 +0000
Subject: Skip tests that are unstable when run on GNU EMBA


Some of these tests are unreliable for us, too.

---

diff --git a/0001-Tag-process-tests-multiple-threads-waiting-unstable-.patch b/0001-Tag-process-tests-multiple-threads-waiting-unstable-.patch
deleted file mode 100644
index 5bddc6b..0000000
--- a/0001-Tag-process-tests-multiple-threads-waiting-unstable-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d3a62e79847f00855eac69477fa3cd78014106c4 Mon Sep 17 00:00:00 2001
-From: Peter Oliver <git@mavit.org.uk>
-Date: Mon, 8 Jul 2024 14:26:26 +0100
-Subject: [PATCH] Tag process-tests/multiple-threads-waiting :unstable in RPM
- %check
-
-* test/src/process-tests.el (process-tests/multiple-threads-waiting):
-Tag it as :unstable when building an RPM package.
----
- test/src/process-tests.el | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/src/process-tests.el b/test/src/process-tests.el
-index 15d46cbae15..ceeaa9f1554 100644
---- a/test/src/process-tests.el
-+++ b/test/src/process-tests.el
-@@ -895,7 +895,8 @@ process-tests/sentinel-with-multiple-processes
-                            (list (list process "finished\n"))))))))))
- 
- (ert-deftest process-tests/multiple-threads-waiting ()
--  :tags (if (getenv "EMACS_EMBA_CI") '(:unstable))
-+  :tags (if (or (getenv "EMACS_EMBA_CI") (getenv "RPM_BUILD_ROOT"))
-+            '(:unstable))
-   (skip-unless (fboundp 'make-thread))
-   (with-timeout (60 (ert-fail "Test timed out"))
-     (process-tests--with-processes processes
--- 
-2.45.2
-
diff --git a/emacs.spec b/emacs.spec
index 072daa0..d9ecfc8 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -43,9 +43,6 @@ Patch:         emacs-pgtk-on-x-error-message.patch
 Patch:         0001-Fix-failing-help-fns-test.patch
 Patch:         0001-Fix-flymake-tests-with-GCC-14.patch
 
-# Skip failing test (need to work out why this fails when building an RPM)
-Patch:         0001-Tag-process-tests-multiple-threads-waiting-unstable-.patch
-
 BuildRequires: alsa-lib-devel
 BuildRequires: atk-devel
 BuildRequires: autoconf
@@ -621,6 +618,10 @@ find %{buildroot}%{_libdir}/ -name '*eln' -type f | xargs touch
 
 
 %check
+# A number of tests that don't work on GNU EMBA are also unstable when
+# run in Koji.
+export EMACS_EMBA_CI=1
+
 cd build-pgtk
 %make_build check
 cd ..