[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-220-g54ec223

[Ralf Wildenhues]

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=54ec22378776eeba17172916006e5b7898e1edc5

The branch, master has been updated
       via  54ec22378776eeba17172916006e5b7898e1edc5 (commit)
       via  6fee87c34e45ad9c91444b684d4ccd6c932debd3 (commit)
       via  edb600843bcf2f72fbac10c46e0a920c7e8ed334 (commit)
       via  716a33f9e43e13ddc8b3dee6188915b933d54091 (commit)
       via  838e94c49802cc28e0fb595426ccd1b55c97581b (commit)
      from  6421a0c141f2b98e2aa40e2ac2f6e487869d4e86 (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 54ec22378776eeba17172916006e5b7898e1edc5
Merge: edb600843bcf2f72fbac10c46e0a920c7e8ed334 
6fee87c34e45ad9c91444b684d4ccd6c932debd3
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Jun 8 20:52:11 2010 +0200

    Merge branch 'fix-distcheck'
    
    * fix-distcheck:
      Fix error in generation of parallel tests.

commit 6fee87c34e45ad9c91444b684d4ccd6c932debd3
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jun 8 20:43:43 2010 +0200

    Fix error in generation of parallel tests.
    
    * tests/defs.in ($am_skip_defs): New variable, to be used when
    ./defs must be sourced multiple times.  If set, unset it and
    only define $srcdir; otherwise, also go through the rest of
    the script.
    ($am_defs_included): Remove, no more needed.
    * tests/Makefile.am ($(parallel_tests)): Update accordingly,
    using only $srcdir from defs.
    Fixes potential test failures of tests that use $required.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit edb600843bcf2f72fbac10c46e0a920c7e8ed334
Merge: 6421a0c141f2b98e2aa40e2ac2f6e487869d4e86 
716a33f9e43e13ddc8b3dee6188915b933d54091
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Jun 8 20:39:33 2010 +0200

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog           |   37 +++++++++++++++++++++++++++++++++++++
 tests/Makefile.am   |   18 +++++++++++++-----
 tests/Makefile.in   |   18 +++++++++++++-----
 tests/acsilent.test |   10 +++++++---
 tests/defs.in       |   14 +++++++-------
 tests/subcond.test  |    7 +++++--
 tests/subst.test    |   12 ++++++++----
 tests/tags.test     |   10 +++++-----
 tests/unused.test   |   11 ++++++++---
 tests/vars.test     |    6 ++++--
 tests/version.test  |    9 ++++++---
 tests/version2.test |   11 +++++++----
 tests/version4.test |    6 ++++--
 tests/vpath.test    |    8 +++++---
 tests/vtexi2.test   |    9 ++++++---
 tests/werror.test   |    6 ++++--
 tests/whoami.test   |    5 ++++-
 17 files changed, 143 insertions(+), 54 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5af5af..f8e3b58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2010-06-08  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Fix error in generation of parallel tests.
+       * tests/defs.in ($am_skip_defs): New variable, to be used when
+       ./defs must be sourced multiple times.  If set, unset it and
+       only define $srcdir; otherwise, also go through the rest of
+       the script.
+       ($am_defs_included): Remove, no more needed.
+       * tests/Makefile.am ($(parallel_tests)): Update accordingly,
+       using only $srcdir from defs.
+       Fixes potential test failures of tests that use $required.
+
+2010-06-08  Stefano Lattarini  <address@hidden>
+
+       Enable `errexit' shell flag in some test scripts.
+       * tests/subcond.test: Enabled `errexit' shell flag, and related
+       minor changes.
+       * tests/subst.test: Likewise.
+       * tests/vars.test: Likewise.
+       * tests/version4.test: Likewise.
+       * tests/vpath.test: Likewise.
+       * tests/vtexi2.test: Likewise.
+       * tests/werror.test: Likewise.
+       * tests/whoami.test: Likewise.
+       * tests/tags.test: Likewise, and avoid to crate an useless dummy
+       header file.
+       * tests/acsilent.test: Likewise, and don't use an easily-avoided
+       command substitution.
+       * tests/unused.test: Likewise, and don't use an easily-avoided
+       command substitution.
+       * tests/version.test: Likewise, and avoid deprecated constructs
+       in the generated `configure.in'.
+       * tests/version2.test: Likewise, and avoid deprecated constructs
+       in the generated `configure.in'.
+
 2010-06-07  Stefano Lattarini  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
@@ -274,6 +310,7 @@
        * tests/dejagnu7.test: Enable shell `errexit' flag.  Also, avoid
        unportable use of fgrep option `-e'.
 
+       Fix conflnk3.test to work with Solaris/Heirloom Sh.
        * tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE'
        instead of respectively `test -e FILE' and `test ! -e FILE',
        since Solaris Sh doesn't grok the latter.  Do not SKIP the test
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2fe615c..671df0c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,12 +32,20 @@ $(parallel_tests): Makefile.am
        $(AM_V_at)rm -f $@ address@hidden
        $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \
        { echo '#!/bin/sh'; \
-         echo '# DO NOT EDIT! GENERATED AUTOMATICALLY!'; \
+         echo '# DO NOT EDIT!  GENERATED AUTOMATICALLY!'; \
+         echo; \
+         echo '# Ensure proper definition of $$srcdir.'; \
+         echo 'am_skip_defs=yes'; \
+         echo '. ./defs || exit 99'; \
+         echo 'test -n "$$srcdir" || exit 99 # sanity check'; \
+         echo; \
+         echo "# Run the test with Automake's parallel-tests driver enabled."; 
\
          echo 'parallel_tests=yes'; \
-         echo '. ./defs || Exit 1'; \
-         echo '# So that the sourced test can re-exec ./defs safely.'; \
-         echo 'cd "$$curdir" || Exit 1'; \
-         echo ". \"\$$testsrcdir/$$input\""; \
+         echo "if test -f \"./$$input\"; then"; \
+         echo "  . \"./$$input\""; \
+         echo 'else'; \
+         echo "  . \"\$$srcdir/$$input\""; \
+         echo 'fi'; \
        } > address@hidden
        $(AM_V_at)chmod a+rx address@hidden && mv -f address@hidden $@
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1bc1958..670867c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1392,12 +1392,20 @@ $(parallel_tests): Makefile.am
        $(AM_V_at)rm -f $@ address@hidden
        $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \
        { echo '#!/bin/sh'; \
-         echo '# DO NOT EDIT! GENERATED AUTOMATICALLY!'; \
+         echo '# DO NOT EDIT!  GENERATED AUTOMATICALLY!'; \
+         echo; \
+         echo '# Ensure proper definition of $$srcdir.'; \
+         echo 'am_skip_defs=yes'; \
+         echo '. ./defs || exit 99'; \
+         echo 'test -n "$$srcdir" || exit 99 # sanity check'; \
+         echo; \
+         echo "# Run the test with Automake's parallel-tests driver enabled."; 
\
          echo 'parallel_tests=yes'; \
-         echo '. ./defs || Exit 1'; \
-         echo '# So that the sourced test can re-exec ./defs safely.'; \
-         echo 'cd "$$curdir" || Exit 1'; \
-         echo ". \"\$$testsrcdir/$$input\""; \
+         echo "if test -f \"./$$input\"; then"; \
+         echo "  . \"./$$input\""; \
+         echo 'else'; \
+         echo "  . \"\$$srcdir/$$input\""; \
+         echo 'fi'; \
        } > address@hidden
        $(AM_V_at)chmod a+rx address@hidden && mv -f address@hidden $@
 
diff --git a/tests/acsilent.test b/tests/acsilent.test
index 6ac7863..abbfc92 100755
--- a/tests/acsilent.test
+++ b/tests/acsilent.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2008  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2008, 2010 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
@@ -18,6 +19,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat >configure.in <<EOF
 AC_INIT
 AM_INIT_GUILE_MODULE
@@ -32,5 +35,6 @@ module=[$1]
 AC_SUBST(module)])
 END
 
-$ACLOCAL > output 2>&1 || { cat output; Exit 1; }
-test -z "`cat output`"
+$ACLOCAL >output 2>&1 || { cat output; Exit 1; }
+cat output
+test ! -s output
diff --git a/tests/defs.in b/tests/defs.in
index 72e9d52..fb056ff 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -20,12 +20,14 @@
 # Defines for Automake testing environment.
 # Tom Tromey <address@hidden>
 
+# Absolutely necessary variable(s).
+srcdir=${srcdir-'@abs_srcdir@'}
+
 # Protect this file against multiple inclusion, useful for generated tests.
-if test x"$am_defs_included" = xyes; then
-  : "$me: ./defs already included"
-  cd "$curdir/$testSubDir" || Exit 99
+if test x"$am_skip_defs" = xyes; then
+  unset am_skip_defs
 
-else # not already included
+else # Do proper testcase setup.
 
 # Be more Bourne compatible.
 # (Snippet copied from configure's initialization in Autoconf 2.64)
@@ -47,8 +49,6 @@ test -f ./defs || {
    exit 1
 }
 
-srcdir=${srcdir-'@abs_srcdir@'}
-
 # Ensure $srcdir is set correctly.
 test -f "$srcdir/defs.in" || {
    echo "$srcdir/defs.in not found, check \$srcdir" 1>&2
@@ -439,4 +439,4 @@ set -x
 
 pwd
 
-fi # not already included
+fi # Proper testcase setup.
diff --git a/tests/subcond.test b/tests/subcond.test
index b04c475..0269cac 100755
--- a/tests/subcond.test
+++ b/tests/subcond.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2006, 2010 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
@@ -15,9 +15,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # It is ok to have a conditional SUBDIRS when using gettext.
+
 required=gettext
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AM_GNU_GETTEXT
 AM_CONDITIONAL(MAUDE, true)
@@ -36,6 +39,6 @@ SUBDIRS =
 endif
 END
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 # Gettext wants config.guess etc.
 $AUTOMAKE --add-missing
diff --git a/tests/subst.test b/tests/subst.test
index 7d45dae..ebc73ca 100755
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2007  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2007, 2010 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
@@ -19,6 +20,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 dnl This test used to have the following lines, which cannot have
 dnl worked sensibly with Autoconf for years, however:
@@ -32,7 +35,8 @@ END
 
 : > Makefile.am
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 grep '^\$1' Makefile.in && Exit 1
-Exit 0
+
+:
diff --git a/tests/tags.test b/tests/tags.test
index 055989f..1eaf569 100755
--- a/tests/tags.test
+++ b/tests/tags.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2010 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
@@ -19,13 +19,13 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > Makefile.am << 'END'
 noinst_HEADERS = iguana.h
 END
 
-: > iguana.h
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 
 grep '^ID:' Makefile.in
diff --git a/tests/unused.test b/tests/unused.test
index a5b4da6..f406b43 100755
--- a/tests/unused.test
+++ b/tests/unused.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1998, 2002, 2003, 2008  Free Software Foundation, Inc.
+# Copyright (C) 1998, 2002, 2003, 2008, 2010 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
@@ -15,8 +16,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test for failing check for unused macros.  From Johan Danielsson.
+
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 MACRO_1
 MACRO_1_2
@@ -29,5 +33,6 @@ AC_DEFUN([MACRO_1_2], echo 12)
 AC_DEFUN([MACRO_1_2_3], echo 123)
 END
 
-$ACLOCAL 2> stderr || { cat stderr >&2; Exit 1; }
-test -z "`cat stderr`"
+$ACLOCAL 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+test ! -s stderr
diff --git a/tests/vars.test b/tests/vars.test
index ae711b0..6163a8d 100755
--- a/tests/vars.test
+++ b/tests/vars.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010 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
@@ -19,6 +19,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > Makefile.am << 'END'
 MY_FLAGS_1=-DABC=345
 MY_FLAGS_2= -DABC=345
@@ -26,5 +28,5 @@ MY_FLAGS_3 =-DABC=345
 MY_FLAGS_4 = -DABC=345
 END
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE
diff --git a/tests/version.test b/tests/version.test
index bfa3f43..a894a75 100755
--- a/tests/version.test
+++ b/tests/version.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2010 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
@@ -19,10 +19,13 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE([sh-utils], [1.12o])
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
 END
 
 : > Makefile.am
@@ -36,5 +39,5 @@ END
 : > ChangeLog
 : > THANKS
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE --gnits
diff --git a/tests/version2.test b/tests/version2.test
index 993c0ba..a25b82b 100755
--- a/tests/version2.test
+++ b/tests/version2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1997, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1997, 2001, 2002, 2010 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
@@ -19,10 +19,13 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
-AM_INIT_AUTOMAKE([sh-utils], 1.12o, no)
-AC_OUTPUT(Makefile)
+AM_INIT_AUTOMAKE([sh-utils], [1.12o], [no])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
 END
 
 : > Makefile.am
@@ -36,5 +39,5 @@ END
 : > ChangeLog
 : > THANKS
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE --gnits
diff --git a/tests/version4.test b/tests/version4.test
index 9ec0cba..f8ceafe 100755
--- a/tests/version4.test
+++ b/tests/version4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010 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
@@ -18,9 +18,11 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > Makefile.am << 'END'
 AUTOMAKE_OPTIONS = 1.4-p3
 END
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE
diff --git a/tests/vpath.test b/tests/vpath.test
index 850aaeb..a95f5b2 100755
--- a/tests/vpath.test
+++ b/tests/vpath.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2010 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
@@ -19,12 +19,14 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > Makefile.am << 'END'
 VPATH = zardoz
 END
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 
 grep 'address@hidden@' Makefile.in && Exit 1
 Exit 0
diff --git a/tests/vtexi2.test b/tests/vtexi2.test
index 633fe13..e1a1b93 100755
--- a/tests/vtexi2.test
+++ b/tests/vtexi2.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2001, 2002, 2010 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
@@ -21,6 +22,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > Makefile.am << 'END'
 info_TEXINFOS = zardoz.texi
 END
@@ -34,7 +37,7 @@ END
 : > mdate-sh
 : > texinfo.tex
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 
 grep '^zardoz\.dvi:' Makefile.in
diff --git a/tests/werror.test b/tests/werror.test
index 5c7a0b5..355f9d2 100755
--- a/tests/werror.test
+++ b/tests/werror.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010 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
@@ -18,9 +18,11 @@
 
 . ./defs || Exit 1
 
+set -e
+
 : > Makefile.am
 
 rm -f install-sh depcomp missing mkinstalldirs
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE --Werror --add-missing
diff --git a/tests/whoami.test b/tests/whoami.test
index f2dcab1..37bd81a 100755
--- a/tests/whoami.test
+++ b/tests/whoami.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1998, 2002, 2010 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
@@ -17,8 +17,11 @@
 # Test to make sure aclocal doesn't barf on "WHO_AM_I=...".  Report
 # from Johan Danielsson (and a very nice bug report, too, I might
 # add).
+
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 WHO_AM_I=17
 END


hooks/post-receive
-- 
GNU Automake