master 94632c611e6: Revert "Update some native comp tests"

[Stefan Monnier]

branch: master
commit 94632c611e6ba5607a1039a8939d5ab173ee5bfb
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    Revert "Update some native comp tests"
    
    This reverts commit 4a0d430bdc3650ca3dfd8bdd14781764fbcbdc7e.
    
    AFAICT that commit was made to accomodate regressions introduced
    in the new `cl-preloaded.el` code and these have been fixed.
---
 test/lisp/emacs-lisp/comp-cstr-tests.el | 2 +-
 test/src/comp-tests.el                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/lisp/emacs-lisp/comp-cstr-tests.el 
b/test/lisp/emacs-lisp/comp-cstr-tests.el
index 955a99ced57..991ab1f40eb 100644
--- a/test/lisp/emacs-lisp/comp-cstr-tests.el
+++ b/test/lisp/emacs-lisp/comp-cstr-tests.el
@@ -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)) . (or integer-or-marker number-or-marker))
+  ((and atom (or number 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 67d632823b2..fbcb6ca9560 100644
--- 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 integer-or-marker))
+       '(or (member foo) number-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 integer-or-marker))
+       '(or null number-or-marker))
 
       ;; 36
       ((defun comp-tests-ret-type-spec-f (x y)