aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen2021-10-11 11:14:26 +0200
committerLars Ingebrigtsen2021-10-11 11:14:26 +0200
commit07edc28bdbfeeaeb1008b4fe21bfda586feae562 (patch)
tree476fba48580734289985d213be5152a10ca40b9e /lisp
parent96278de8ac2166c37925f2dfbc0eeb6d368142b9 (diff)
downloademacs-07edc28bdbfeeaeb1008b4fe21bfda586feae562.tar.gz
emacs-07edc28bdbfeeaeb1008b4fe21bfda586feae562.zip
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).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/emacs-lisp/ert.el4
1 files changed, 4 insertions, 0 deletions
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."
783 (ert--run-test-debugger test-execution-info 783 (ert--run-test-debugger test-execution-info
784 args))) 784 args)))
785 (debug-on-error t) 785 (debug-on-error t)
786 ;; Don't infloop if the error being called is erroring
787 ;; out, and we have `debug-on-error' bound to nil inside
788 ;; the test.
789 (backtrace-on-error-noninteractive nil)
786 (debug-on-quit t) 790 (debug-on-quit t)
787 ;; FIXME: Do we need to store the old binding of this 791 ;; FIXME: Do we need to store the old binding of this
788 ;; and consider it in `ert--run-test-debugger'? 792 ;; and consider it in `ert--run-test-debugger'?