Prefer incf to cl-incf in tests

* test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-reify-function):
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-getf):
* test/lisp/emacs-lisp/cl-macs-tests.el
(cl-macs-loop-for-as-arith-order-side-effects)
(cl-macs-loop-for-as-equals-then, cl-macs-loop-do, cl-macs-loop-finally)
(cl-macs-loop-in-ref, cl-macs-loop-being-elements-of-ref)
(cl-macs-test--symbol-macrolet, cl-the):
* test/lisp/emacs-lisp/cl-seq-tests.el (cl-lib-test-remove)
(cl-lib-test-remove-if-not):
* test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el
(edebug-test-code-range):
* test/lisp/emacs-lisp/edebug-tests.el (edebug-tests-deduplicate):
* test/lisp/emacs-lisp/generator-tests.el (cps-while-incf):
(cps-test-iter-cleanup-once-only):
* test/lisp/emacs-lisp/hierarchy-tests.el
(hierarchy-labelfn-button-if-does-not-button-unless-condition)
(hierarchy-labelfn-button-if-does-button-when-condition):
* test/lisp/emacs-lisp/let-alist-tests.el (let-alist-evaluate-once):
* test/lisp/emacs-lisp/lisp-mode-tests.el
(indent-sexp, lisp-indent-region):
* test/lisp/emacs-lisp/map-tests.el (test-map-elt-gv)
(test-setf-map-with-function):
* test/lisp/emacs-lisp/multisession-tests.el (multi-test-sqlite-simple)
(multi-test-sqlite-busy, multi-test-files-simple)
(multi-test-files-busy):
* test/lisp/emacs-lisp/oclosure-tests.el
(oclosure-test, oclosure-test-mutate):
* test/lisp/emacs-lisp/track-changes-tests.el
(track-changes-tests--random):
* test/lisp/files-tests.el (files-tests--with-buffer-offer-save):
* test/lisp/net/shr-tests.el (shr-test/zoom-image):
* test/lisp/replace-tests.el (replace-tests-with-undo):
* test/src/buffer-tests.el (test-overlay-randomly):
* test/src/data-tests.el (test-bool-vector-bv-from-hex-string):
* test/src/fns-tests.el (fns-tests-sort):
* test/src/json-tests.el (json-insert/signal, json-insert/throw):
* test/src/minibuf-tests.el (minibuf-tests--strings-to-symbol-alist)
(minibuf-tests--strings-to-string-alist)
(minibuf-tests--strings-to-string-hashtable)
(minibuf-tests--strings-to-symbol-hashtable):
* test/src/process-tests.el (make-process/file-handler/found): Prefer
incf to cl-incf.

6 files changed, 11 insertions, 11 deletions

diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el
index 4d608fa9d24..b4b9e761986 100644
--- a/test/src/buffer-tests.el
+++ b/test/src/buffer-tests.el
@@ -1753,7 +1753,7 @@ quae ab illo inventore veritatis et quasi architecto beatae vitae
 dicta sunt, explicabo.  "))
 
       (while (< iteration-count iteration-target)
-        (cl-incf iteration-count)
+        (incf iteration-count)
 
         ;; Toggle GROWING if we've reached a size boundary.  The idea
         ;; is to initially steadily increase the overlay count, then
@@ -1780,7 +1780,7 @@ dicta sunt, explicabo.  "))
                    (ov (make-overlay begin end nil
                                      (= 0 (random 2)) (= 0 (random 2)))))
               (aset overlays overlay-count ov)
-              (cl-incf overlay-count)))
+              (incf overlay-count)))
            ((and (not create-overlay) (> overlay-count 0))
 
             ;; Possibly delete a random overlay.
diff --git a/test/src/data-tests.el b/test/src/data-tests.el
index 44c786ac579..260bdb281bb 100644
--- a/test/src/data-tests.el
+++ b/test/src/data-tests.el
@@ -185,7 +185,7 @@ this is exactly representable and is greater than
       (dolist (n (nreverse nibbles))
         (dotimes (_ 4)
           (aset bv i (oddp n))
-          (cl-incf i)
+          (incf i)
           (setf n (ash n -1)))))
     bv))
 
diff --git a/test/src/fns-tests.el b/test/src/fns-tests.el
index eebc92bfd41..3d6cd5de8fe 100644
--- a/test/src/fns-tests.el
+++ b/test/src/fns-tests.el
@@ -345,7 +345,7 @@
          (counter 0)
          (my-counter (lambda ()
                        (if (< counter 500)
-                           (cl-incf counter)
+                           (incf counter)
                          (setq counter 0)
                          (garbage-collect))))
          (rand 1)
diff --git a/test/src/json-tests.el b/test/src/json-tests.el
index 941caae9431..94b6cfcffca 100644
--- a/test/src/json-tests.el
+++ b/test/src/json-tests.el
@@ -357,7 +357,7 @@ Test with both unibyte and multibyte strings."
     (let ((calls 0))
       (add-hook 'after-change-functions
                 (lambda (_begin _end _length)
-                  (cl-incf calls)
+                  (incf calls)
                   (signal 'json-tests--error
                           '("Error in `after-change-functions'")))
                 :local)
@@ -371,7 +371,7 @@ Test with both unibyte and multibyte strings."
     (let ((calls 0))
       (add-hook 'after-change-functions
                 (lambda (_begin _end _length)
-                  (cl-incf calls)
+                  (incf calls)
                   (throw 'test-tag 'throw-value))
                 :local)
       (should
diff --git a/test/src/minibuf-tests.el b/test/src/minibuf-tests.el
index ec8f7123234..2f932eacc4a 100644
--- a/test/src/minibuf-tests.el
+++ b/test/src/minibuf-tests.el
@@ -29,10 +29,10 @@
   (mapcar #'intern list))
 (defun minibuf-tests--strings-to-symbol-alist (list)
   (let ((num 0))
-    (mapcar (lambda (str) (cons (intern str) (cl-incf num))) list)))
+    (mapcar (lambda (str) (cons (intern str) (incf num))) list)))
 (defun minibuf-tests--strings-to-string-alist (list)
   (let ((num 0))
-    (mapcar (lambda (str) (cons str (cl-incf num))) list)))
+    (mapcar (lambda (str) (cons str (incf num))) list)))
 (defun minibuf-tests--strings-to-obarray (list)
   (let ((ob (obarray-make 7)))
     (mapc (lambda (str) (intern str ob)) list)
@@ -40,12 +40,12 @@
 (defun minibuf-tests--strings-to-string-hashtable (list)
   (let ((ht (make-hash-table :test #'equal))
         (num 0))
-    (mapc (lambda (str) (puthash str (cl-incf num) ht)) list)
+    (mapc (lambda (str) (puthash str (incf num) ht)) list)
     ht))
 (defun minibuf-tests--strings-to-symbol-hashtable (list)
   (let ((ht (make-hash-table :test #'equal))
         (num 0))
-    (mapc (lambda (str) (puthash (intern str) (cl-incf num) ht)) list)
+    (mapc (lambda (str) (puthash (intern str) (incf num) ht)) list)
     ht))
 
 ;;; Functions that produce a predicate (for *-completion functions)
diff --git a/test/src/process-tests.el b/test/src/process-tests.el
index 21972b86aa0..7634cec2207 100644
--- a/test/src/process-tests.el
+++ b/test/src/process-tests.el
@@ -352,7 +352,7 @@ works as expected if a file name handler is found."
                (should (equal args '(make-process :name "name"
                                                   :command ("/some/binary")
                                                   :file-handler t)))
-               (cl-incf file-handler-calls)
+               (incf file-handler-calls)
                'fake-process))
       (let ((file-name-handler-alist (list (cons (rx bos "test-handler:")
                                                  #'file-handler)))