From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 5 Jun 2012 15:08:59 +0000 (+0200)
Subject: [ng] warns: also report typos for 'LOG_DEPENDENCIES' variables
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=739820b18ce319efd6ba393291b3041743a4cc18;p=thirdparty%2Fautomake.git

[ng] warns: also report typos for 'LOG_DEPENDENCIES' variables

* lib/am/parallel-tests.am (am__using_parallel_tests): New, set to
"yes" to inform the rest of the makefile that the parallel testsuite
harness is in use.
* lib/am/check-typos.am (.am/vartypos/whitelisted-vars): Whitelist
only 'LOG_DEPENDENCIES' variables that actually correspond to a
declared test extension.
* t/vartypos-deps.sh: New test.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/lib/am/check-typos.am b/lib/am/check-typos.am
index 625896e22..82e19c916 100644
--- a/lib/am/check-typos.am
+++ b/lib/am/check-typos.am
@@ -35,10 +35,18 @@
   TAGS_DEPENDENCIES \
   CONFIG_STATUS_DEPENDENCIES \
   CONFIGURE_DEPENDENCIES
-# FIXME: Maybe we should only ignore the '*LOG_DEPENDENCIES' variables
-# FIXME: for which an associated test extension is actually defined?
-# FIXME: Or would that be overkill?
-.am/vartypos/whitelisted-vars += LOG_DEPENDENCIES %_LOG_DEPENDENCIES
+
+# The '*LOG_DEPENDENCIES' variables are used to declare extra dependencies
+# for test cases, but only when the parallel testsuite harness is in use.
+ifeq "$(am__using_parallel_tests)" "yes"
+# Extension-less tests are always accepted.
+.am/vartypos/whitelisted-vars += LOG_DEPENDENCIES
+# We expect '.ext' to be a valid tests extension iff 'EXT_LOG_DRIVER' is
+# defined.  Hence the following logic.
+.am/vartypos/whitelisted-vars += \
+  $(patsubst %_LOG_DRIVER,%_LOG_DEPENDENCIES, \
+             $(filter %_LOG_DRIVER,$(.VARIABLES)))
+endif
 
 # Canonicalized names of programs and libraries (vanilla or libtool) that
 # have been declared.
diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index 819b4e2c0..b62885334 100644
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -25,6 +25,9 @@ include color-tests.am
 ## of more test metadata, and the use of custom test derivers and protocols
 ## (among them, TAP).
 
+## Used by (at least) 'check-typos.am'.
+am__using_parallel_tests := yes
+
 am__maybe_invalid_test_extensions = \
   $(if \
     $(strip $1), \
diff --git a/t/vartypos-deps.sh b/t/vartypos-deps.sh
new file mode 100755
index 000000000..212b29a34
--- /dev/null
+++ b/t/vartypos-deps.sh
@@ -0,0 +1,103 @@
+#! /bin/sh
+# Copyright (C) 2010-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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure we warn about possible variable typos for the
+# *_DEPENDENCIES when we should, and do not warn about them
+# when we should not.
+
+. ./defs || Exit 1
+
+subdirs='ok1 ok2 ko1 ko2'
+mkdir $subdirs
+
+errgrep ()
+{
+  grep "variable '${1}_DEPENDENCIES' is defined" stderr
+  grep "'$1' as canonical name" stderr
+}
+
+cat >> configure.ac <<END
+AC_CONFIG_FILES([$(for d in $subdirs; do echo $d/Makefile; done)])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+AM_LDFLAGS = unused
+ETAGS_ARGS = --unused
+TAGS_DEPENDENCIES = foo.c
+CONFIG_STATUS_DEPENDENCIES = cvs-version.sh
+CONFIGURE_DEPENDENCIES = cvs-version.sh
+foo.c:
+	echo 'int main (void) { return 0; }' > $@
+END
+
+: > cvs-version.sh
+
+cat > ok1/Makefile.am <<'END'
+TESTS = unused ignored.test
+LOG_DEPENDENCIES = unused
+TEST_LOG_DEPENDENCIES = unused
+END
+
+cat > ok2/Makefile.am <<'END'
+TESTS = ignored.sh notseen.tap
+TEST_EXTENSIONS = .sh .tap
+LOG_DEPENDENCIES = unused
+SH_LOG_DEPENDENCIES = unused
+TAP_LOG_DEPENDENCIES = unused
+END
+
+cat > ko1/Makefile.am <<'END'
+LOG_DEPENDENCIES =
+TEST_LOG_DEPENDENCIES =
+END
+
+cat > ko2/Makefile.am <<'END'
+TESTS = unused ignored.test
+TEST_LOG_DEPENDENCIES =
+LOG_DEPENDENCIES =
+SH_LOG_DEPENDENCIES =
+CONFIGSTATUS_DEPENDENCIES =
+CONFIG_DEPENDENCIES =
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE
+(cd ok1 && $MAKE)
+(cd ok2 && $MAKE)
+
+cd ko1
+$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+errgrep LOG
+errgrep TEST_LOG
+cd ..
+
+cd ko2
+$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+errgrep SH_LOG
+errgrep CONFIG
+errgrep CONFIGSTATUS
+$EGREP "'(TEST_)?LOG" stderr && Exit 1
+cd ..
+
+: