[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2d989e8 2/2: Unbreak a few unit tests that rely on lack of backtr
From: |
Philipp Stephani |
Subject: |
master 2d989e8 2/2: Unbreak a few unit tests that rely on lack of backtraces |
Date: |
Mon, 7 Dec 2020 06:07:14 -0500 (EST) |
branch: master
commit 2d989e81b730061397501033f355cbb300894573
Author: Philipp Stephani <phst@google.com>
Commit: Philipp Stephani <phst@google.com>
Unbreak a few unit tests that rely on lack of backtraces
* test/lisp/emacs-lisp/gv-tests.el (gv-dont-define-expander-in-file)
(gv-dont-define-expander-other-file):
* test/lisp/emacs-lisp/edebug-tests.el (edebug-tests-with-default-config):
Suppress backtraces in batch mode to unbreak unit tests.
---
test/lisp/emacs-lisp/edebug-tests.el | 5 ++++-
test/lisp/emacs-lisp/gv-tests.el | 11 ++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/test/lisp/emacs-lisp/edebug-tests.el
b/test/lisp/emacs-lisp/edebug-tests.el
index 8aae26a..2c340c4 100644
--- a/test/lisp/emacs-lisp/edebug-tests.el
+++ b/test/lisp/emacs-lisp/edebug-tests.el
@@ -97,7 +97,10 @@ back to the top level.")
;; sit-on interferes with keyboard macros.
(edebug-sit-on-break nil)
- (edebug-continue-kbd-macro t))
+ (edebug-continue-kbd-macro t)
+
+ ;; don't print backtraces, otherwise error messages don't match
+ (backtrace-on-error-noninteractive nil))
,@body))
(defmacro edebug-tests-with-normal-env (&rest body)
diff --git a/test/lisp/emacs-lisp/gv-tests.el b/test/lisp/emacs-lisp/gv-tests.el
index 29e4273..8fc6b51 100644
--- a/test/lisp/emacs-lisp/gv-tests.el
+++ b/test/lisp/emacs-lisp/gv-tests.el
@@ -83,7 +83,10 @@
(with-temp-buffer
(call-process (concat invocation-directory invocation-name)
nil '(t t) nil
- "-Q" "-batch" "--eval" (prin1-to-string
`(byte-compile-file ,el))
+ "-Q" "-batch"
+ "--eval" (prin1-to-string
+ `(let ((backtrace-on-error-noninteractive nil))
+ (byte-compile-file ,el)))
"-l" elc)
(should (equal (buffer-string)
"Symbol's function definition is void: \\(setf\\
gv-test-foo\\)\n")))))
@@ -133,8 +136,10 @@
"-Q" "-batch" "--eval" (prin1-to-string
`(byte-compile-file ,el))
"-l" elc
"--eval"
- (prin1-to-string '(progn (setf (gv-test-foo gv-test-pair)
99)
- (message "%d" (car
gv-test-pair)))))
+ (prin1-to-string
+ '(let ((backtrace-on-error-noninteractive nil))
+ (setf (gv-test-foo gv-test-pair) 99)
+ (message "%d" (car gv-test-pair)))))
(should (string-match
"\\`Symbol.s function definition is void: \\\\(setf\\\\
gv-test-foo\\\\)\n\\'"
(buffer-string))))))