From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 11 Oct 2021 09:14:26 +0000 (+0200)
Subject: Fix ert errors when there's a test that binds `debug-on-error'
X-Git-Tag: emacs-28.0.90~330
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07edc28bdbfeeaeb1008b4fe21bfda586feae562;p=emacs.git

Fix ert errors when there's a test that binds `debug-on-error'

* lisp/emacs-lisp/ert.el (ert--run-test-internal): Don't infloop
on errors when signalling errors (bug#51131).
---

diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 98cb1fd1cf6..b7d984374cb 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -783,6 +783,10 @@ This mainly sets up debugger-related bindings."
                           (ert--run-test-debugger test-execution-info
                                                   args)))
               (debug-on-error t)
+              ;; Don't infloop if the error being called is erroring
+              ;; out, and we have `debug-on-error' bound to nil inside
+              ;; the test.
+              (backtrace-on-error-noninteractive nil)
               (debug-on-quit t)
               ;; FIXME: Do we need to store the old binding of this
               ;; and consider it in `ert--run-test-debugger'?