[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1325-gda41458

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=da414584b7c62f90fa21ad6420cea2ef8553c119

The branch, testsuite-work has been updated
       via  da414584b7c62f90fa21ad6420cea2ef8553c119 (commit)
       via  428501b438e956a24c4bbbae9cb11efc37497a76 (commit)
       via  95a2d8b3b02c25e64b167223a4b314f8f8d57fa8 (commit)
       via  1aca197ed2b238721b4f47ffdb7e18923e22b329 (commit)
       via  ac2300d4878e0342fb292d9c2fbeaf717c15febb (commit)
       via  2f318014b337e8ef8533a9380341e4ce6568ab0c (commit)
       via  2d5a0d87ddeaaab474e4fc1d9816feb275711384 (commit)
      from  3ceeef44e0de6ea8e42711ec497061d3361f2d48 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit da414584b7c62f90fa21ad6420cea2ef8553c119
Author: Stefano Lattarini <address@hidden>
Date:   Fri Sep 9 15:26:31 2011 +0200

    test defs: more environment cleanup
    
    * tests/defs: Also unset the XFAIL_TESTS, and various
    LOG_DRIVER, LOG_COMPILER variables (and corresponding
    flags variable).

commit 428501b438e956a24c4bbbae9cb11efc37497a76
Author: Stefano Lattarini <address@hidden>
Date:   Fri Sep 9 13:02:11 2011 +0200

    tests: allow depmod.tap to only run a subset of its tests
    
    * tests/depmod.tap: If command-line arguments are passed to the
    tests, they are now taken as the list of test names for which the
    checks are to be run.

commit 95a2d8b3b02c25e64b167223a4b314f8f8d57fa8
Author: Stefano Lattarini <address@hidden>
Date:   Fri Sep 9 12:47:57 2011 +0200

    tests: allow instspc.tap to only run a subset of its tests
    
    * tests/instspc.tap: If command-line arguments are passed to the
    tests, they are now taken as the list of test names for which the
    checks are to be run.

commit 1aca197ed2b238721b4f47ffdb7e18923e22b329
Merge: 3ceeef4 ac2300d
Author: Stefano Lattarini <address@hidden>
Date:   Fri Sep 9 12:00:28 2011 +0200

    Merge branch 'test-protocols' into testsuite-work
    
    * test-protocols:
      coverage: distcheck-hook to catch missing/outdated *.m4 files

commit ac2300d4878e0342fb292d9c2fbeaf717c15febb
Merge: 95d11c2 2f31801
Author: Stefano Lattarini <address@hidden>
Date:   Fri Sep 9 11:54:22 2011 +0200

    Merge branch 'master' into test-protocols
    
    * master:
      coverage: distcheck-hook to catch missing/outdated *.m4 files

commit 2f318014b337e8ef8533a9380341e4ce6568ab0c
Merge: eae5429 2d5a0d8
Author: Stefano Lattarini <address@hidden>
Date:   Fri Sep 9 11:41:42 2011 +0200

    Merge branch 'maint'
    
    * maint:
      coverage: distcheck-hook to catch missing/outdated *.m4 files

commit 2d5a0d87ddeaaab474e4fc1d9816feb275711384
Author: Stefano Lattarini <address@hidden>
Date:   Thu Sep 1 17:42:41 2011 +0200

    coverage: distcheck-hook to catch missing/outdated *.m4 files
    
    Related to automake bug#9037.
    
    * tests/distcheck-missing-m4.test: New test.
    * tests/distcheck-outdated-m4.test: Likewise.
    * tests/distcheck-hook-m4.am: New data file, used by the new
    tests.
    * tests/Makefile.am (distcheck-m4-missing.log,
    distcheck-m4-outdated.log): Depend on it.
    (EXTRA_DIST): Distribute it.
    (TESTS): Add the new tests.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |   34 +++++++++++++
 tests/Makefile.am                |    4 ++
 tests/Makefile.in                |    7 ++-
 tests/defs                       |   12 ++++-
 tests/depmod.tap                 |   33 +++++++++---
 tests/distcheck-hook-m4.am       |   30 +++++++++++
 tests/distcheck-missing-m4.test  |  102 ++++++++++++++++++++++++++++++++++++++
 tests/distcheck-outdated-m4.test |   88 ++++++++++++++++++++++++++++++++
 tests/instspc.tap                |   25 ++++++++--
 tests/list-of-tests.mk           |    2 +
 10 files changed, 323 insertions(+), 14 deletions(-)
 create mode 100644 tests/distcheck-hook-m4.am
 create mode 100755 tests/distcheck-missing-m4.test
 create mode 100755 tests/distcheck-outdated-m4.test

diff --git a/ChangeLog b/ChangeLog
index 01e30ab..39aa991 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2011-09-09  Stefano Lattarini  <address@hidden>
+
+       test defs: more environment cleanup
+       * tests/defs: Also unset the XFAIL_TESTS, and various
+       LOG_DRIVER, LOG_COMPILER variables (and corresponding
+       flags variable).
+
+2011-09-09  Stefano Lattarini  <address@hidden>
+
+       tests: allow depmod.tap to only run a subset of its tests
+       * tests/depmod.tap: If command-line arguments are passed to the
+       tests, they are now taken as the list of test names for which the
+       checks are to be run.
+
+2011-09-09  Stefano Lattarini  <address@hidden>
+
+       tests: allow instspc.tap to only run a subset of its tests
+       * tests/instspc.tap: If command-line arguments are passed to the
+       tests, they are now taken as the list of test names for which the
+       checks are to be run.
+
+2011-09-09  Stefano Lattarini  <address@hidden>
+
+       coverage: distcheck-hook to catch missing/outdated *.m4 files
+       Related to automake bug#9037.
+       * tests/distcheck-missing-m4.test: New test.
+       * tests/distcheck-outdated-m4.test: Likewise.
+       * tests/distcheck-hook-m4.am: New data file, used by the new
+       tests.
+       * tests/Makefile.am (distcheck-m4-missing.log,
+       distcheck-m4-outdated.log): Depend on it.
+       (EXTRA_DIST): Distribute it.
+       (TESTS): Add the new tests.
+
 2011-09-08  Stefano Lattarini  <address@hidden>
 
        tests: more granularity in variables for tools overriding
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 50c8ca9..51edc2f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -103,6 +103,10 @@ $(TEST_LOGS): defs defs-static aclocal-$(APIVERSION) 
automake-$(APIVERSION)
 $(TEST_LOGS): plain-functions.sh tap-functions.sh
 EXTRA_DIST += tap-functions.sh plain-functions.sh
 
+# Few more static dependencies.
+distcheck-missing-m4.log distcheck-outdated-m4.log: distcheck-hook-m4.am
+EXTRA_DIST += distcheck-hook-m4.am
+
 # Keep in sync with AC_SUBST'd stuff in defs-static.in.
 do_subst = sed \
   -e 's|@address@hidden|$(abs_srcdir)|g' \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 814f31d..5ae15b1 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -299,7 +299,7 @@ EXTRA_DIST = ChangeLog-old $(handwritten_TESTS) 
tap-summary-aux.sh \
        tap-setup.sh extract-testsuite-summary \
        testsuite-summary-checks.sh trivial-test-driver \
        $(generated_TESTS) gen-testsuite-part tap-functions.sh \
-       plain-functions.sh defs-static.in
+       plain-functions.sh distcheck-hook-m4.am defs-static.in
 
 # Hand-written tests.
 
@@ -638,6 +638,8 @@ distcheck-configure-flags-am.test \
 distcheck-configure-flags-subpkg.test \
 distcheck-hook.test \
 distcheck-hook2.test \
+distcheck-missing-m4.test \
+distcheck-outdated-m4.test \
 dmalloc.test \
 doc-parsing-buglets-colneq-subst.test \
 doc-parsing-buglets-tabs.test \
@@ -2253,6 +2255,9 @@ $(TEST_LOGS): defs defs-static aclocal-$(APIVERSION) 
automake-$(APIVERSION)
 # subdivision of the tests.
 $(TEST_LOGS): plain-functions.sh tap-functions.sh
 
+# Few more static dependencies.
+distcheck-missing-m4.log distcheck-outdated-m4.log: distcheck-hook-m4.am
+
 defs-static: defs-static.in
        $(AM_V_at)rm -f $@ address@hidden
        $(AM_V_GEN)$(do_subst) $(srcdir)/defs-static.in >address@hidden
diff --git a/tests/defs b/tests/defs
index ac30e43..d50cb39 100644
--- a/tests/defs
+++ b/tests/defs
@@ -161,11 +161,21 @@ unset TESTS_ENVIRONMENT AM_TESTS_ENVIRONMENT
 unset DISABLE_HARD_ERRORS
 unset AM_COLOR_TESTS
 unset TESTS
-unset TEST_LOG_COMPILER
+unset XFAIL_TESTS
 unset TEST_LOGS
 unset TEST_SUITE_LOG
 unset RECHECK_LOGS
 unset VERBOSE
+for pfx in TEST_ TAP_ ''; do
+  unset ${pfx}LOG_COMPILER
+  unset ${pfx}LOG_COMPILE # Not a typo!
+  unset ${pfx}LOG_FLAGS
+  unset AM_${pfx}LOG_FLAGS
+  unset ${pfx}LOG_DRIVER
+  unset ${pfx}LOG_DRIVER_FLAGS
+  unset AM_${pfx}LOG_DRIVER_FLAGS
+done
+unset pfx
 
 # Re-enable, it had been temporarily disabled above.
 set -e
diff --git a/tests/depmod.tap b/tests/depmod.tap
index 6f6a73e..f2f59b4 100755
--- a/tests/depmod.tap
+++ b/tests/depmod.tap
@@ -54,13 +54,6 @@
 required=cc
 . ./defs || Exit 99
 
-# Per each valid depmode three kinds of VPATH, and per each of them
-# a test on "./configure" and one on "make & remake"; so there are
-# 17 * 3 * 2 = 102.
-plan_ 102
-
-ocwd=`pwd` || fatal_ "cannot get current working directory"
-
 # Keep this in sync with the contents of depend.m4.
 all_depmodes=`\
   sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < "$am_scriptdir/depcomp" \
@@ -70,6 +63,30 @@ all_depmodes=`\
   && test -n "$all_depmodes" \
   || fatal_ "can't extract list of valid depmodes"
 
+# Allow the user to select a subset of the tests.
+if test $# -gt 0; then
+  tested_depmodes=$*
+  for depmode in $tested_depmodes; do
+    case " $all_depmodes " in
+      *" $depmode "*);;
+      *) fatal_ "invalid user-specified depmode '$depmode'"
+    esac
+  done
+  n=`for m in $tested_depmodes; do echo $m; done | wc -l`
+  # We need to determine the TAP plan adaptively.
+  # Per each valid depmode three kinds of VPATH, and per each of them
+  # a test on "./configure" and one on "make & remake"; so there are
+  # $n * 3 * 2 tests.
+  plan_ `expr $n '*' 6`
+  unset n
+else
+  tested_depmodes=$all_depmodes
+  # Prefer static TAP plan if possible, minimizes the chance of errors.
+  plan_ 102
+fi
+
+ocwd=`pwd` || fatal_ "cannot get current working directory"
+
 srctree=depmod-1.0
 mkdir $srctree
 mv missing install-sh depcomp configure.in $srctree
@@ -129,7 +146,7 @@ cp -pR $srctree/* $longpath || fatal_ "cannot populate long 
path"
 cp -pR $srctree/* . || fatal_ "cannot populate top-level directory"
 
 for vpath in simple long absolute; do
-  for depmode in $all_depmodes; do
+  for depmode in $tested_depmodes; do
     case $vpath in
       simple)
         srcdir=..;;
diff --git a/tests/distcheck-hook-m4.am b/tests/distcheck-hook-m4.am
new file mode 100644
index 0000000..88681e9
--- /dev/null
+++ b/tests/distcheck-hook-m4.am
@@ -0,0 +1,30 @@
+## Data files for some tests.  Not used in the automake build system.
+##
+## Copyright (C) 2011 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/>.
+
+distcheck-hook:
+       @fatal () { echo "$@: $$*" >&2; exit 1; }; \
+       $(am__cd) $(distdir) && chmod u+w . && mkdir _m4 \
+         || fatal "cannot setup distdir"; \
+       $(ACLOCAL) -I _m4 $(ACLOCAL_AMFLAGS) --install --output=_am.m4 \
+         || fatal "cannot regenerate aclocal.m4"; \
+       lst=`ls _m4 | tr '\012\015' '  '`; \
+       if test -n "$$lst"; then \
+         fatal "required m4 files not distributed or outdated: $$lst"; \
+       fi; \
+       $(AUTOCONF) -o /dev/null || fatal "can't remake configure"; \
+       rm -rf _m4 _am.m4 autom4te.cache && chmod a-w . \
+         || fatal "cannot reset distdir"
diff --git a/tests/distcheck-missing-m4.test b/tests/distcheck-missing-m4.test
new file mode 100755
index 0000000..f4e0eda
--- /dev/null
+++ b/tests/distcheck-missing-m4.test
@@ -0,0 +1,102 @@
+#! /bin/sh
+# Copyright (C) 2011 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/>.
+
+# Test that we can define a distcheck-hook to diagnose m4 files
+# missing from the dist tarball (interaction with `--install').
+# See automake bug#9037.
+
+. ./defs || Exit 1
+
+set -e
+
+cwd=`pwd` || fatal_ "cannot get current working directory"
+
+cp "$testsrcdir"/distcheck-hook-m4.am . \
+  || fatal_ "cannot fetch makefile fragment \`distcheck-hook-m4.am'"
+
+cat > Makefile.am << 'END'
+## The lack of `--install' here is meant.
+ACLOCAL_AMFLAGS = -I m4
+include $(srcdir)/distcheck-hook-m4.am
+END
+
+cat >> configure.in << 'END'
+dnl We *deliberately* don't use m4_pattern_forbid here.
+AC_OUTPUT
+MY_FOO
+MY_BAR
+MY_BAZ
+END
+
+mkdir m4 acdir acdir1 acdir2
+
+cat > acdir/dirlist << END
+$cwd/acdir1
+$cwd/acdir2
+END
+
+echo 'AC_DEFUN([MY_FOO], [:])' > m4/foo.m4
+echo 'AC_DEFUN([MY_BAR], [:])' > acdir1/bar.m4
+echo 'AC_DEFUN([MY_BAZ], [:])' > acdir1/baz.m4
+echo 'AC_DEFUN([MY_QUX], [:])' > acdir2/qux.m4
+
+ACLOCAL="$ACLOCAL --system-acdir=$cwd/acdir"; export ACLOCAL
+
+# We don't use `--install' here.  Our distcheck-hook should catch this.
+$ACLOCAL -I m4
+$AUTOCONF
+$EGREP 'MY_(FOO|BAR|BAZ)' configure && Exit 1 # Sanity check.
+$AUTOMAKE
+
+./configure
+
+$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+cat output
+$EGREP "required m4 file.*not distributed.* bar.m4( |$)" output
+$EGREP "required m4 file.*not distributed.* baz.m4( |$)" output
+# Check that we don't fail for spurious errors.
+$EGREP -i 'mkdir:|autom4te.*\.cache|:.*(permission|denied)' output && Exit 1
+
+# Now we use `--install', and "make distcheck" should pass.
+$ACLOCAL -I m4 --install
+test -f m4/bar.m4 # Sanity check.
+test -f m4/baz.m4 # Likewise.
+using_gmake || $MAKE Makefile
+$MAKE distcheck
+
+# We start to use a new "third-party" macro from a new .m4 file, but forget
+# to re-run "aclocal --install" by hand, relying on automatic remake rules.
+# Our distcheck-hook should catch this too.
+echo MY_QUX >> configure.in
+
+$MAKE
+$EGREP 'MY_(FOO|BAR|BAZ|QUX)' configure && Exit 1 # Sanity check.
+
+$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+cat output
+$EGREP "required m4 file.*not distributed.* qux.m4( |$)" output
+# Check that we don't fail for spurious errors.
+$EGREP -i 'mkdir:|autom4te.*\.cache|permission|denied' output && Exit 1
+# Check that we don't complain for files that should have been found.
+grep " ba[rz].m4" output && Exit 1
+
+# Now we again use `--install', and "make distcheck" should pass.
+$ACLOCAL -I m4 --install
+test -f m4/qux.m4 # Sanity check.
+using_gmake || $MAKE Makefile
+$MAKE distcheck
+
+:
diff --git a/tests/distcheck-outdated-m4.test b/tests/distcheck-outdated-m4.test
new file mode 100755
index 0000000..74f2922
--- /dev/null
+++ b/tests/distcheck-outdated-m4.test
@@ -0,0 +1,88 @@
+#! /bin/sh
+# Copyright (C) 2011 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/>.
+
+# Test that we can define a distcheck-hook to diagnose outdated m4
+# files in a dist tarball (interaction with `--install').
+# See automake bug#9037.
+
+. ./defs || Exit 1
+
+set -e
+
+cwd=`pwd` || fatal_ "cannot get current working directory"
+
+cp "$testsrcdir"/distcheck-hook-m4.am . \
+  || fatal_ "cannot fetch makefile fragment \`distcheck-hook-m4.am'"
+
+cat > Makefile.am << 'END'
+## The lack of `--install' here is meant.
+ACLOCAL_AMFLAGS = -I m4
+include $(srcdir)/distcheck-hook-m4.am
+END
+
+cat >> configure.in << 'END'
+AC_OUTPUT
+MY_FOO
+MY_BAR
+MY_BAZ
+END
+
+mkdir m4 acdir
+echo 'AC_DEFUN([MY_FOO], [:])' > m4/foo.m4
+echo 'AC_DEFUN([MY_BAR], [:])' > acdir/bar.m4
+cat > acdir/baz.m4 << 'END'
+# serial 1
+AC_DEFUN([MY_BAZ], [:])
+END
+
+ACLOCAL="$ACLOCAL --system-acdir=$cwd/acdir"; export ACLOCAL
+
+# We don't use `--install' here.  Our distcheck-hook should catch this.
+$ACLOCAL -I m4 --install
+$AUTOCONF
+$AUTOMAKE
+
+./configure
+$MAKE distcheck # Sanity check.
+
+# We start to use a new "third-party" macro in a new version
+# of a pre-existing third-party m4 file, but forget to re-run
+# "aclocal --install" by hand, relying on automatic remake
+# rules.  Our distcheck-hook should catch this too.
+echo MY_ZARDOZ >> configure.in
+
+cat > acdir/baz.m4 << 'END'
+# serial 2
+AC_DEFUN([MY_BAZ], [:])
+AC_DEFUN([MY_ZARDOZ], [:])
+END
+
+$MAKE # Rebuild configure and makefiles.
+$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+cat output
+
+$EGREP "required m4 file.* outdated.* baz.m4( |$)" output
+# Check that we don't fail for spurious errors.
+$EGREP -i 'mkdir:|autom4te.*\.cache|permission|denied' output && Exit 1
+# Check that we don't complain for files that should have been found.
+$EGREP " (foo|bar).m4" output && Exit 1
+
+# Now we again use `--install', and "make distcheck" should pass.
+$ACLOCAL -I m4 --install
+using_gmake || $MAKE Makefile
+$MAKE distcheck
+
+:
diff --git a/tests/instspc.tap b/tests/instspc.tap
index 46f4b4e..6f819ef 100755
--- a/tests/instspc.tap
+++ b/tests/instspc.tap
@@ -21,8 +21,6 @@
 
 . ./defs || Exit 99
 
-plan_ 94 # Two tests per "problematic string".
-
 # Usage: is_in_list ITEM [LIST...]
 is_in_list ()
 {
@@ -41,7 +39,7 @@ define_problematic_string ()
   eval "instspc__$tst=\$1" \
     || fatal_ "define_problematic_string: bad argument: '$tst'"
   shift
-  test_names_list="$test_names_list $tst"
+  all_test_names_list="$all_test_names_list $tst"
   # Some of the "problematic" characters cannot be used in the name of
   # a build or install directory on a POSIX host.  These lists should
   # be empty, but are not due to limitations in Autoconf, Automake, Make,
@@ -55,7 +53,7 @@ define_problematic_string ()
 }
 
 # Be sure to avoid interferences from the environment.
-test_names_list=''
+all_test_names_list=''
 builddir_xfails=''
 destdir_xfails=''
 
@@ -210,6 +208,25 @@ unset def
 #  Test data end  #
 # =============== #
 
+# Allow the user to select a subset of the tests.
+if test $# -gt 0; then
+  test_names_list=$*
+  for test_name in $test_names_list; do
+    case " $all_test_names_list " in
+      *" $test_name "*);;
+      *) fatal_ "invalid user-specified test_name '$test_name'"
+    esac
+  done
+  # We need to determine the TAP plan adaptively.
+  n=`for t in $test_names_list; do echo $t; done | wc -l`
+  plan_ `expr $n '*' 2` # Two tests per "problematic string".
+  unset n
+else
+  test_names_list=$all_test_names_list
+  # Prefer static TAP plan if possible, minimizes the chance of errors.
+  plan_ 94
+fi
+
 ocwd=`pwd` || fatal_ "cannot get current working directory"
 
 create_input_data
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 05b874b..6cadef4 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -320,6 +320,8 @@ distcheck-configure-flags-am.test \
 distcheck-configure-flags-subpkg.test \
 distcheck-hook.test \
 distcheck-hook2.test \
+distcheck-missing-m4.test \
+distcheck-outdated-m4.test \
 dmalloc.test \
 doc-parsing-buglets-colneq-subst.test \
 doc-parsing-buglets-tabs.test \


hooks/post-receive
-- 
GNU Automake