procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Make comp tests robust against sxhash-equal internal changes

Browse source 
* test/src/comp-tests.el (cl-seq): Require.
(comp-tests--types-equal): New function.
(comp-tests-check-ret-type-spec): Make use of.
This commit is contained in:
Andrea Corallo 2024-01-25 14:37:17 +01:00
parent b014bca833
commit 5d91cbf9a5
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
test/src/comp-tests.el
View file

@ -28,6 +28,7 @@
(require 'ert)
(require 'ert-x)
(require 'cl-lib)
(require 'cl-seq)
(require 'comp)
(require 'comp-cstr)
@ -903,14 +904,26 @@ Return a list of results."
(should (subr-native-elisp-p (symbol-function 'comp-tests-fw-prop-1-f)))
(should (= (comp-tests-fw-prop-1-f) 6))))
(defun comp-tests--types-equal (t1 t2)
"Whether the types T1 and T2 are equal."
(or (equal t1 t2) ; optimisation for the common case
(and (consp t1) (consp t2)
(eq (car t1) (car t2))
(if (memq (car t1) '(and or member))
(null (cl-set-exclusive-or (cdr t1) (cdr t2)
:test #'comp-tests--types-equal))
(and (= (length t1) (length t2))
(cl-every #'comp-tests--types-equal (cdr t1) (cdr t2)))))))
(defun comp-tests-check-ret-type-spec (func-form ret-type)
(let ((lexical-binding t)
(native-comp-speed 2)
(f-name (cl-second func-form)))
(eval func-form t)
(native-compile f-name)
(should (equal (cl-third (subr-type (symbol-function f-name)))
ret-type))))
(should (comp-tests--types-equal
(cl-third (subr-type (symbol-function f-name)))
ret-type))))
(cl-eval-when (compile eval load)
(cl-defstruct comp-foo a b)