From: Jim Porter <jporterbugs@gmail.com>
Date: Sat, 10 Dec 2022 06:56:24 +0000 (-0800)
Subject: ; Fix a failure when running server-tests via the command line
X-Git-Tag: emacs-29.0.90~1258
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b7ece2095614fc5ff08cfc03641720ba1143100;p=emacs.git

; Fix a failure when running server-tests via the command line

* test/lisp/server-tests.el
(server-tests/server-force-stop/keeps-frames): Delete every new frame
created during the test.  On some systems, 'delete-terminal' will
delete the frames for us, so this ensures that if there are no new
frames, nothing happens.

(cherry picked from commit 3785fe52e4692ffef14c0a1e50361c22d66fabe8)
---

diff --git a/test/lisp/server-tests.el b/test/lisp/server-tests.el
index ebf84481c61..5ef66052c80 100644
--- a/test/lisp/server-tests.el
+++ b/test/lisp/server-tests.el
@@ -218,8 +218,8 @@ long as this works, the problem in bug#58877 shouldn't occur."
                  (eq (terminal-live-p terminal) t)
                  (not (eq system-type 'windows-nt)))
         (delete-terminal terminal)))
-    ;; Delete the created frame.
-    (delete-frame (car (cl-set-difference (frame-list) starting-frames))
-                  t)))
+    ;; If there are any new frames remaining, delete them.
+    (mapc (lambda (frame) (delete-frame frame t))
+          (cl-set-difference (frame-list) starting-frames))))
 
 ;;; server-tests.el ends here