diff options
| author | Jim Porter <jporterbugs@gmail.com> | 2022-12-09 22:56:24 -0800 |
|---|---|---|
| committer | Mattias Engdegård <mattiase@acm.org> | 2022-12-10 11:06:47 +0100 |
| commit | 1b7ece2095614fc5ff08cfc03641720ba1143100 (patch) | |
| tree | 4187231ebfd9e0b7c95d35ee63ac9e8fc1ba9df6 /test/lisp/server-tests.el | |
| parent | 44c5f3614973d8dc389ddcdc1b3f8ab1c809194d (diff) | |
| download | emacs-1b7ece2095614fc5ff08cfc03641720ba1143100.tar.gz emacs-1b7ece2095614fc5ff08cfc03641720ba1143100.tar.bz2 emacs-1b7ece2095614fc5ff08cfc03641720ba1143100.zip | |
; 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)
Diffstat (limited to 'test/lisp/server-tests.el')
| -rw-r--r-- | test/lisp/server-tests.el | 6 |
1 files 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 |