From 0aa85dd219f4be8dbf3383661fd2b42370945b87 Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Sun, 21 Jun 2026 03:19:08 -0400
Subject: test: make subr mocks variadic for native-comp, add arity meta-test

Re-enabling native-comp surfaced a suite-wide fragility. When a test redefines a C primitive (or a native-compiled function), native-comp routes native callers through a trampoline that calls the mock with the primitive's maximum arity. A fixed-arity mock narrower than the primitive then throws wrong-number-of-arguments, intermittently, as the eln-cache fills.

I swept every arity-narrow subr mock to append &rest _ (188 sites, preserving any named args the body uses), and added tests/test-meta-subr-mock-arity.el, which fails make test on any subr mock too narrow for the primitive's arity. The rule isn't "never mock a subr". The suite mocks message and completing-read freely. It's "a subr mock must accept the primitive's arity."

Background, the three failure modes, and the research are in docs/native-comp-subr-mocking.org.
---
 tests/test-ui-navigation-split-follow-undo-kill.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/test-ui-navigation-split-follow-undo-kill.el')

diff --git a/tests/test-ui-navigation-split-follow-undo-kill.el b/tests/test-ui-navigation-split-follow-undo-kill.el
index f6981a36a..35ed7a020 100644
--- a/tests/test-ui-navigation-split-follow-undo-kill.el
+++ b/tests/test-ui-navigation-split-follow-undo-kill.el
@@ -70,7 +70,7 @@ non-visited entry, not the second."
                            (setq buffer-file-name "/tmp/alive.txt"))
                          b))))
               ((symbol-function 'find-file)
-               (lambda (f) (setq opened f))))
+               (lambda (f &rest _) (setq opened f))))
       (unwind-protect
           (cj/undo-kill-buffer 1)
         (when (get-buffer "*test-alive*") (kill-buffer "*test-alive*"))))
@@ -93,7 +93,7 @@ currently-open most-recent file was never skipped."
                            (setq buffer-file-name "/tmp/alive.txt"))
                          b))))
               ((symbol-function 'find-file)
-               (lambda (f) (setq opened f))))
+               (lambda (f &rest _) (setq opened f))))
       (unwind-protect
           (cj/undo-kill-buffer 1)
         (when (get-buffer "*test-alive*") (kill-buffer "*test-alive*"))))
@@ -108,7 +108,7 @@ currently-open most-recent file was never skipped."
               ((symbol-function 'recentf-mode) (lambda (&rest _) t))
               ((symbol-function 'buffer-list) (lambda (&rest _) nil))
               ((symbol-function 'find-file)
-               (lambda (f) (setq opened f))))
+               (lambda (f &rest _) (setq opened f))))
       (cj/undo-kill-buffer 2))
     (should (equal opened "/tmp/b.org"))))
 
@@ -121,7 +121,7 @@ currently-open most-recent file was never skipped."
               ((symbol-function 'recentf-mode) (lambda (&rest _) t))
               ((symbol-function 'buffer-list) (lambda (&rest _) nil))
               ((symbol-function 'find-file)
-               (lambda (f) (setq opened f))))
+               (lambda (f &rest _) (setq opened f))))
       (cj/undo-kill-buffer 0))
     (should-not opened)))
 
@@ -134,7 +134,7 @@ not a wrong-type-argument from find-file on nil."
     (cl-letf (((symbol-function 'require) (lambda (&rest _) t))
               ((symbol-function 'recentf-mode) (lambda (&rest _) t))
               ((symbol-function 'buffer-list) (lambda (&rest _) nil))
-              ((symbol-function 'find-file) (lambda (f) (setq opened f))))
+              ((symbol-function 'find-file) (lambda (f &rest _) (setq opened f))))
       (should-error (cj/undo-kill-buffer 5) :type 'user-error))
     (should-not opened)))
 
-- 
cgit v1.2.3