From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 16 Jan 2012 08:40:21 +0000 (+0100)
Subject: maintcheck: completeness check on list of tests simplified
X-Git-Tag: ng-0.5a~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=v1.11-1736-g083a75b;p=thirdparty%2Fautomake.git

maintcheck: completeness check on list of tests simplified

* CheckListOfTests.am: Simplify the recipe, accordingly to the
assumption that all the entries in $(TEST_EXTENSIONS) and in
$(TESTS) have an associated real test script.  This was not the
case when we used to have some entries in $(TESTS) that were not
real files, but rather "parameters" (sort of) for the corresponding
$(LOG_COMPILER).  However, that usage had proven to be confusing
and brittle, and thus removed (see commit 'v1.11-1308-g375f23d' of
September 8 2011, "testsuite: revamp generation of autogenerated
tests").
---

diff --git a/CheckListOfTests.am b/CheckListOfTests.am
index 28cb79558..0a484470e 100644
--- a/CheckListOfTests.am
+++ b/CheckListOfTests.am
@@ -1,6 +1,6 @@
 ## -*- Automake -*-
 ##
-## Copyright (C) 2011 Free Software Foundation, Inc.
+## Copyright (C) 2011, 2012 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -31,20 +31,6 @@ maintainer-check-list-of-tests:
 	 else \
 	   diff='diff'; \
 	 fi; \
-## Determine which files are to be considered test scripts.
-## Do not blindly look for `$(TEST_EXTENSIONS)', because the parallel
-## testsuite driver provided by Automake allow entries in `$(TESTS)'
-## not to be real files, but rather paramaters for the corresponding
-## LOG_COMPILER (well, sort of).
-	 set X $(checked_test_extensions); shift; \
-	 if test $$# -eq 0; then \
-	   set X $(TEST_EXTENSIONS); shift; \
-	 fi; \
-	 if test $$# -eq 0; then \
-	   echo '$@: internal error: $$(checked_test_extensions) and' \
-	        '$$(TEST_EXTENSIONS) are both undefined or empty' >&2; \
-	   exit 255; \
-	 fi; \
 ## List of tests in Makefile.
 	 lst='$(expected_list_of_tests)'; \
 	 test -n "$$lst" || lst='$(TESTS)'; \
@@ -52,7 +38,7 @@ maintainer-check-list-of-tests:
 	   echo "$$t"; \
 	 done | sort >$(am__tmk); \
 ## List of tests on filesystem.  Be careful to cater for VPATH builds too.
-	 for ext in $$*; do \
+	 for ext in $(TEST_EXTENSIONS); do \
 	   ls *$$ext 2>/dev/null; \
 	   if test $(srcdir) != $(builddir); then \
 	     (cd $(srcdir) && ls *$$ext 2>/dev/null); \