From 3785fe52e4692ffef14c0a1e50361c22d66fabe8 Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Fri, 9 Dec 2022 22:56:24 -0800 Subject: [PATCH] ; 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. --- test/lisp/server-tests.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- 2.39.2