[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 0508045 3/8: Don't error on circular values in test
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] master 0508045 3/8: Don't error on circular values in testcover |
Date: |
Mon, 7 Aug 2017 21:09:40 -0400 (EDT) |
branch: master
commit 0508045ed7159bce5b5ea3b5fb72cf78b8b4ee8e
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Don't error on circular values in testcover
* lisp/emacs-lisp/testcover.el (testcover-after, testcover-1value):
Consider circular lists to be non-equal instead of signaling error.
---
lisp/emacs-lisp/testcover.el | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 433ad38..17891fd 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -463,7 +463,10 @@ binding `testcover-vector' to the code-coverage vector for
TESTCOVER-SYM
(cond
((eq (aref testcover-vector idx) 'unknown)
(aset testcover-vector idx val))
- ((not (equal (aref testcover-vector idx) val))
+ ((not (condition-case ()
+ (equal (aref testcover-vector idx) val)
+ ;; TODO: Actually check circular lists for equality.
+ (circular-list nil)))
(aset testcover-vector idx 'ok-coverage)))
val)
@@ -475,7 +478,10 @@ same value during coverage testing."
((eq (aref testcover-vector idx) '1value)
(aset testcover-vector idx (cons '1value val)))
((not (and (eq (car-safe (aref testcover-vector idx)) '1value)
- (equal (cdr (aref testcover-vector idx)) val)))
+ (condition-case ()
+ (equal (cdr (aref testcover-vector idx)) val)
+ ;; TODO: Actually check circular lists for equality.
+ (circular-list nil))))
(error "Value of form marked with `1value' does vary: %s" val)))
val)
- [Emacs-diffs] master updated (e6fa083 -> bec5b60), Noam Postavsky, 2017/08/07
- [Emacs-diffs] master 00f7e31 4/8: Add a test of handling of circular values to testcover-tests, Noam Postavsky, 2017/08/07
- [Emacs-diffs] master 95a04fd 2/8: ; Avoid test failures when running from compiled test files, Noam Postavsky, 2017/08/07
- [Emacs-diffs] master cc30d77 5/8: Let `define-symbol-prop' take effect during compilation, Noam Postavsky, 2017/08/07
- [Emacs-diffs] master b5c8e98 6/8: Let the cl-typep effects of defclass work during compilation (Bug#27718), Noam Postavsky, 2017/08/07
- [Emacs-diffs] master 054c198 1/8: Catch argument and macroexpansion errors in ert, Noam Postavsky, 2017/08/07
- [Emacs-diffs] master 0508045 3/8: Don't error on circular values in testcover,
Noam Postavsky <=
- [Emacs-diffs] master 79a7456 7/8: Don't define gv expanders in compiler's runtime (Bug#27016), Noam Postavsky, 2017/08/07
- [Emacs-diffs] master bec5b60 8/8: ; Merge: Fixes for macroexpansion and compilation, Noam Postavsky, 2017/08/07