]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
test: sync list-of-tests.
authorKarl Berry <karl@freefriends.org>
Thu, 20 Jun 2024 17:04:55 +0000 (10:04 -0700)
committerKarl Berry <karl@freefriends.org>
Thu, 20 Jun 2024 17:04:55 +0000 (10:04 -0700)
* 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
t/list-of-tests.mk

index 48ebaa6fbe9c2fce34ae2b25da44e49c144b6cb1..bce8643c0961488c6415aed3d5bd975c6fa1f714 100644 (file)
@@ -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
index bd4cb617e23fa044a0ee42369cd6752cd232429f..1e0f364ba525ffaa6b7493bd31252c4cfb3022f4 100644 (file)
@@ -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 \