oops, I missed a few things

configure

@@ -121997,17 +121997,21 @@ if test -f "${srcdir}/${opt_makefile}.in"; then
       ac_config_files="$ac_config_files test/automated/Makefile"
 
 fi
-if test -d test/infra && test -r "${srcdir}/test/infra/Makefile.in"; then
-  SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} test/infra/Makefile
+
+if test -d test/infra && test -r "${srcdir}/test/infra/Makefile.in"
+then :
+
+  SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} test/infra/Makefile"
   ac_config_files="$ac_config_files test/infra/Makefile"
 
 fi
-if test -d test/manual/noverlay && test -r "${srcdir}/test/manual/noverlay/Makefile.in"; then
-  SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} test/manual/noverlay/Makefile
+if test -d test/manual/noverlay && test -r "${srcdir}/test/manual/noverlay/Makefile.in"
+then :
+
+  SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} test/manual/noverlay/Makefile"
   ac_config_files="$ac_config_files test/manual/noverlay/Makefile"
 
 fi
-
 if test -d machocheck || test -d ${srcdir}/machocheck; then
   SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} machocheck/Makefile"
   ac_config_files="$ac_config_files machocheck/Makefile"

configure.ac

@@ -10949,14 +10949,16 @@ if test -f "${srcdir}/${opt_makefile}.in"; then
   dnl# ",[],[opt_makefile='${opt_makefile}']" and it should work.
   AC_CONFIG_FILES([test/automated/Makefile])
 fi
-if test -d test/infra && test -r "${srcdir}/test/infra/Makefile.in"; then
-  SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} test/infra/Makefile
-  AC_CONFIG_FILES([test/infra/Makefile])
-fi
-if test -d test/manual/noverlay && test -r "${srcdir}/test/manual/noverlay/Makefile.in"; then
-  SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} test/manual/noverlay/Makefile
-  AC_CONFIG_FILES([test/manual/noverlay/Makefile])
-fi
+
+AS_IF([test -d test/infra && test -r "${srcdir}/test/infra/Makefile.in"],[
+  SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} test/infra/Makefile"
+  AC_CONFIG_FILES([test/infra/Makefile])dnl
+])dnl
+
+AS_IF([test -d test/manual/noverlay && test -r "${srcdir}/test/manual/noverlay/Makefile.in"],[
+  SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} test/manual/noverlay/Makefile"
+  AC_CONFIG_FILES([test/manual/noverlay/Makefile])dnl
+])dnl
 
 dnl# this subdir is imported from ld64, and used like a library for the
 dnl# isemacsvalid executable:

test/lisp/emacs-lisp/package-resources/key.pub

@@ -0,0 +1,14 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Alice's OpenPGP certificate
+
+mDMEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/U
+b7O1u120JkFsaWNlIExvdmVsYWNlIDxhbGljZUBvcGVucGdwLmV4YW1wbGU+iJAE
+ExYIADgCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTrhbtfozp14V6UTmPy
+MVUMT0fjjgUCXaWfOgAKCRDyMVUMT0fjjukrAPoDnHBSogOmsHOsd9qGsiZpgRnO
+dypvbm+QtXZqth9rvwD9HcDC0tC+PHAsO7OTh1S1TC9RiJsvawAfCPaQZoed8gK4
+OARcRwTpEgorBgEEAZdVAQUBAQdAQv8GIa2rSTzgqbXCpDDYMiKRVitCsy203x3s
+E9+eviIDAQgHiHgEGBYIACAWIQTrhbtfozp14V6UTmPyMVUMT0fjjgUCXEcE6QIb
+DAAKCRDyMVUMT0fjjlnQAQDFHUs6TIcxrNTtEZFjUFm1M0PJ1Dng/cDW4xN80fsn
+0QEA22Kr7VkCjeAEC08VSTeV+QFsmz55/lntWkwYWhmvOgE=
+=iIGO
+-----END PGP PUBLIC KEY BLOCK-----

test/lisp/emacs-lisp/package-resources/key.sec

@@ -0,0 +1,16 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Comment: Alice's OpenPGP Transferable Secret Key
+
+lFgEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/U
+b7O1u10AAP9XBeW6lzGOLx7zHH9AsUDUTb2pggYGMzd0P3ulJ2AfvQ4RtCZBbGlj
+ZSBMb3ZlbGFjZSA8YWxpY2VAb3BlbnBncC5leGFtcGxlPoiQBBMWCAA4AhsDBQsJ
+CAcCBhUKCQgLAgQWAgMBAh4BAheAFiEE64W7X6M6deFelE5j8jFVDE9H444FAl2l
+nzoACgkQ8jFVDE9H447pKwD6A5xwUqIDprBzrHfahrImaYEZzncqb25vkLV2arYf
+a78A/R3AwtLQvjxwLDuzk4dUtUwvUYibL2sAHwj2kGaHnfICnF0EXEcE6RIKKwYB
+BAGXVQEFAQEHQEL/BiGtq0k84Km1wqQw2DIikVYrQrMttN8d7BPfnr4iAwEIBwAA
+/3/xFPG6U17rhTuq+07gmEvaFYKfxRB6sgAYiW6TMTpQEK6IeAQYFggAIBYhBOuF
+u1+jOnXhXpROY/IxVQxPR+OOBQJcRwTpAhsMAAoJEPIxVQxPR+OOWdABAMUdSzpM
+hzGs1O0RkWNQWbUzQ8nUOeD9wNbjE3zR+yfRAQDbYqvtWQKN4AQLTxVJN5X5AWyb
+Pnn+We1aTBhaGa86AQ==
+=n8OM
+-----END PGP PRIVATE KEY BLOCK-----

test/lisp/emacs-lisp/package-resources/multi-file-readme.txt

@@ -0,0 +1 @@
+This is a bare-bones readme file for the multi-file package.

test/lisp/emacs-lisp/package-resources/package-test-server.py

@@ -0,0 +1,21 @@
+import sys
+
+try:
+    from http.server import HTTPServer, SimpleHTTPRequestHandler
+except ImportError:
+    from BaseHTTPServer import HTTPServer
+    from SimpleHTTPServer import SimpleHTTPRequestHandler
+
+
+HandlerClass = SimpleHTTPRequestHandler
+HandlerClass.protocol_version = "HTTP/1.0"
+server_address = ("127.0.0.1", int(sys.argv[1]) if sys.argv[1:] else 0)
+httpd = HTTPServer(server_address, HandlerClass)
+
+ip, port = httpd.socket.getsockname()[0:2]
+print("Server started, http://%s:%s/" % (ip, port))
+# Flush in case we're in full buffering mode (instead of line
+# buffering), this might happen if python is a cygwin program and we
+# run it from a native w32 program.
+sys.stdout.flush()
+httpd.serve_forever()

test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh

@@ -0,0 +1,34 @@
+#! /bin/sh
+
+# Generate a new key and update the signatures for tests.
+
+# Copyright (C) 2020-2024 Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+export GPG_AGENT=""
+KEYRING="./key.ring"
+TRUSTDB="./trust.db"
+GPG="gpg --no-default-keyring --trustdb-name $TRUSTDB --keyring $KEYRING --yes"
+
+rm $KEYRING
+#$GPG --full-generate-key
+#$GPG --export --armor > "../key.pub"
+#$GPG --export-secret-keys -armor > "../key.sec"
+$GPG --import ../key.sec
+$GPG --detach-sign --sign "./archive-contents"
+$GPG --detach-sign --sign "./elpa-packages.eld"
+$GPG --detach-sign --sign "./signed-good-1.0.el"

test/lisp/emacs-lisp/package-resources/simple-single-readme.txt

@@ -0,0 +1,3 @@
+This package provides a minor mode to frobnicate and/or bifurcate
+any flanges you desire. To activate it, type "C-M-r M-3 butterfly"
+and all your dreams will come true.

test/manual/etags/f-src/entry.strange_suffix

@@ -1,3 +1,4 @@
+C -*- Fortran -*-
 C$Procedure      PRTPKG ( Declare Arguments for Error Message Routines )
 
       LOGICAL FUNCTION PRTPKG ( SHORT, LONG, EXPL, TRACE, DFAULT, TYPE )