[automake-commit] branch master updated: test: sync list-of-tests.

[Karl Berry]

This is an automated email from the git hooks/post-receive script.

karl pushed a commit to branch master
in repository automake.

View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=c7ac3e437c79b444f35a092eeb753c347f7a2625

The following commit(s) were added to refs/heads/master by this push:
     new c7ac3e437 test: sync list-of-tests.
c7ac3e437 is described below

commit c7ac3e437c79b444f35a092eeb753c347f7a2625
Author: Karl Berry <karl@freefriends.org>
AuthorDate: Thu Jun 20 10:04:55 2024 -0700

    test: sync list-of-tests.
    
    * t/list-of-tests.mk (handwritten_TESTS): add back t/instdir-ltlib.sh;
    turns out all tests need to be listed there, XFAIL_TESTS is not
    included, and that seems ok.
    * t/CheckListOfTests.am (maintainer-check-list-of-tests): only
    delete temp files if result is successful.
---
 t/CheckListOfTests.am | 2 +-
 t/list-of-tests.mk    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/t/CheckListOfTests.am b/t/CheckListOfTests.am
index 48ebaa6fb..bce8643c0 100644
--- a/t/CheckListOfTests.am
+++ b/t/CheckListOfTests.am
@@ -53,13 +53,13 @@ maintainer-check-list-of-tests:
 ## Compare the two lists, complain if they differ.
         if $$diff $(am__tmk) $(am__tfs) >$(am__tdf); then \
            result=0; \
+           rm -f $(am__tmk) $(am__tfs) $(am__tdf); \
         else \
            echo '$@: list of tests in Makefile and on filesystem differ' >&2; \
            echo "+ $$diff in-makefile on-filesystem" >&2; \
            cat $(am__tdf) >&2; \
            result=1; \
         fi; \
-        rm -f $(am__tmk) $(am__tfs) $(am__tdf); \
         exit $$result;
 
 .PHONY: clean-maintcheck-testslist-tmp
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index bd4cb617e..1e0f364ba 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -17,7 +17,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-# FIXME: this "expected failures" are in truth an hack used to
+# FIXME: These "expected failures" are a kludge used to
 # FIXME: to verify that some incorrect usages of our perl libraries
 # FIXME: raise an error.  We should find a cleaner way to check that.
 perl_fake_XFAIL_TESTS = \
@@ -28,6 +28,9 @@ t/pm/DisjCon3.pl \
 t/pm/Version2.pl \
 t/pm/Version3.pl
 
+# These must be separately/redundantly included in handwritten_TESTS
+# below.  Despite the redundancy, it seems cleaner to keep
+# handwritten_TESTS as a list of all such .sh tests.
 XFAIL_TESTS = \
 t/all.sh \
 t/cond17.sh \
@@ -546,6 +549,7 @@ t/instdir-cond2.sh \
 t/instdir-no-empty.sh \
 t/instdir-java.sh \
 t/instdir-lisp.sh \
+t/instdir-ltlib.sh \
 t/instdir-prog.sh \
 t/instdir-python.sh \
 t/instdir-texi.sh \