Update some native comp tests

* test/src/comp-tests.el (comp-tests-ret-type-spec-13)
(comp-tests-ret-type-spec-35): Update.
* test/lisp/emacs-lisp/comp-cstr-tests.el (comp-cstr-test-62)
(comp-cstr-test-75): Likewise.

(cherry picked from commit 4a0d430bdc3650ca3dfd8bdd14781764fbcbdc7e)

diff --git a/test/lisp/emacs-lisp/comp-cstr-tests.el b/test/lisp/emacs-lisp/comp-cstr-tests.el
index edc70b12d4b5b5bbcca6d5c1182afe64b4590407..c3a7092819d2f5be1841393a6c8b5986044cde3f 100644 (file)
--- a/test/lisp/emacs-lisp/comp-cstr-tests.el
+++ b/test/lisp/emacs-lisp/comp-cstr-tests.el
@@ -170,7 +170,7 @@ The arg is an alist of: type specifier -> expected type specifier."
   ;; 61
   ((and atom (not symbol)) . atom)
   ;; 62
-  ((and atom (not string)) . (or array sequence atom))
+  ((and atom (not string)) . (or array atom))
   ;; 63 Conservative
   ((and symbol (not (member foo))) . symbol)
   ;; 64 Conservative
@@ -196,7 +196,7 @@ The arg is an alist of: type specifier -> expected type specifier."
   ;; 74
   ((and boolean (or number marker)) . nil)
   ;; 75
-  ((and atom (or number marker)) . number-or-marker)
+  ((and atom (or number marker)) . (or integer-or-marker number-or-marker))
   ;; 76
   ((and symbol (or number marker)) . nil)
   ;; 77

diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index fbcb6ca95604c910105d53de148813c979aba9c3..67d632823b2263708fee9bed39686400bbcef981 100644 (file)
--- a/test/src/comp-tests.el
+++ b/test/src/comp-tests.el
@@ -1029,7 +1029,7 @@ Return a list of results."
          (if (= x y)
              x
            'foo))
-       '(or (member foo) number-or-marker))
+       '(or (member foo) number-or-marker integer-or-marker))
 
       ;; 14
       ((defun comp-tests-ret-type-spec-f (x)
@@ -1169,7 +1169,7 @@ Return a list of results."
       ((defun comp-tests-ret-type-spec-f (x)
         (when (> x 1.0)
           x))
-       '(or null number-or-marker))
+       '(or null number-or-marker integer-or-marker))
 
       ;; 36
       ((defun comp-tests-ret-type-spec-f (x y)