[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2029-gbb061d3

[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=bb061d336f318da0adb85ae3002a6e0f4246332f

The branch, master has been updated
       via  bb061d336f318da0adb85ae3002a6e0f4246332f (commit)
       via  68f47e9a04057af10c01af602a0c06353c37ecf3 (commit)
       via  e55116a5eb5071b56bb9c88a620ff65bf3081d4b (commit)
       via  b51a9afe6977b988e5240906d0b0c288bc5b3fad (commit)
      from  3b5f6115437f568a530c9162ede552ad728f0690 (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 bb061d336f318da0adb85ae3002a6e0f4246332f
Author: Stefano Lattarini <address@hidden>
Date:   Sun Feb 26 13:31:00 2012 +0100

    tests: avoid spurious failure (line too long in awk)
    
    * tests/parallel-tests-many.test: Use perl, not awk, to write the
    Makefile.am with (deliberately) overly long TESTS content, as some
    inferior awk implementations (e.g., Solaris 10 /usr/bin/awk) are
    unable to handle the long lines used there and die with errors like:
    "awk: string too long near line 5".

commit 68f47e9a04057af10c01af602a0c06353c37ecf3
Author: Stefano Lattarini <address@hidden>
Date:   Sun Feb 26 13:10:19 2012 +0100

    tests: avoid spurious failures when awk is "traditional awk"
    
    * tests/Makefile.am (do_subst): Also substitute '@AWK@'.
    * tests/defs-static.in ($AWK): New, user-overridable and defaulting
    to the substituted '@AWK@'.
    * tests/defs (fetch_tap_driver): When the shell+awk implementation
    of the TAP driver is required, export AM_TAP_AWK to point to a
    properly capable awk, since the default awk might be a "traditional"
    implementation, which won't be enough for our driver.  This is the
    right fix, since a proper setting of AM_TAP_AWK in the driver's
    environment is expected (and documented to be required) in real
    world uses of 'tap-driver.sh'.

commit e55116a5eb5071b56bb9c88a620ff65bf3081d4b
Author: Stefano Lattarini <address@hidden>
Date:   Sun Feb 26 11:22:32 2012 +0100

    tests: avoid many spurious failures for shells with busted 'set -e'
    
    Some versions of the BSD Korn shell wrongly bail out when the
    'errexit' shell flag is active and the left-hand command in a
    "&&" list fails and that list is the *last* command of an entry
    in a "case" statement.
    
    * tests/defs (gcc, g++, gcj): Work around that.

commit b51a9afe6977b988e5240906d0b0c288bc5b3fad
Author: Stefano Lattarini <address@hidden>
Date:   Wed Feb 22 10:12:02 2012 +0100

    aclocal: don't create /usr/share/aclocal as empty
    
    Related to automake bug#10791.
    
    Since automake 1.11.2, aclocal no longer succeeds if the system
    acdir '${datadir}/aclocal' (i.e., "/usr/share/aclocal" when
    ${prefix} is "/usr") does not exist.  So we now have a directory
    *installed empty by default*, but whose existence is required by
    aclocal in order for it to function at all.  This might be
    confusing, and sounds like asking for trouble in the long term.
    
    So we now also install a simple README file in that directory,
    which briefly explains its purpose and warn that its existence
    is required by the normal aclocal functioning.
    
    * m4/acdir/README: New file.
    * m4/Makefile.am (dist_system_ac_DATA): Add it.
    * m4/acdir/.placeholder: Delete, no more needed.
    * m4/Makefile.am (EXTRA_DIST): Remove it.
    * THANKS: Update.

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

Summary of changes:
 THANKS                         |    1 +
 m4/Makefile.am                 |    5 ++---
 m4/acdir/.placeholder          |    2 --
 m4/acdir/README                |    9 +++++++++
 tests/Makefile.am              |    1 +
 tests/defs                     |    4 ++++
 tests/defs-static.in           |    1 +
 tests/parallel-tests-many.test |   30 ++++++++++++++++++++++--------
 8 files changed, 40 insertions(+), 13 deletions(-)
 delete mode 100644 m4/acdir/.placeholder
 create mode 100644 m4/acdir/README

diff --git a/THANKS b/THANKS
index 36f8f4b..7b7c9df 100644
--- a/THANKS
+++ b/THANKS
@@ -360,6 +360,7 @@ Thomas Tanner               address@hidden
 Toralf Förster                address@hidden
 Tim Goodwin            address@hidden
 Tim Mooney             address@hidden
+Tim Retout             address@hidden
 Tim Rice               address@hidden
 Tim Van Holder         address@hidden
 Toshio Kuratomi                address@hidden
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 29e5e05..572fca7 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -55,10 +55,9 @@ tar.m4 \
 upc.m4 \
 vala.m4
 
-# So that $(system_acdir) will be created by "make install".
-dist_system_ac_DATA =
+dist_system_ac_DATA = acdir/README
 
-EXTRA_DIST = acdir/.placeholder amversion.in
+EXTRA_DIST = amversion.in
 
 # We build amversion.m4 here, instead of from config.status,
 # because config.status is rerun each time one of configure's
diff --git a/m4/acdir/.placeholder b/m4/acdir/.placeholder
deleted file mode 100644
index 8dd7f67..0000000
--- a/m4/acdir/.placeholder
+++ /dev/null
@@ -1,2 +0,0 @@
-This file is here only to ensure the directory containing it exists
-in the git repository, and goes in the distribution tarball.
diff --git a/m4/acdir/README b/m4/acdir/README
new file mode 100644
index 0000000..c2bf903
--- /dev/null
+++ b/m4/acdir/README
@@ -0,0 +1,9 @@
+This directory is where .m4 files providing third-party autoconf
+macros can be placed to be automatically found by the aclocal(1)
+program.
+
+The .m4 files placed here could be shared among different versions
+of aclocal, so be careful.
+
+Even no actual .m4 files are present, this directory is required
+in order for aclocal to work properly.  Please do not remove it.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b6d41c7..c14a390 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -136,6 +136,7 @@ do_subst = sed \
   -e 's|@address@hidden|$(APIVERSION)|g' \
   -e 's|@address@hidden|$(PATH_SEPARATOR)|g' \
   -e 's|@address@hidden|$(SHELL)|g' \
+  -e 's|@address@hidden|$(AWK)|g' \
   -e 's|@address@hidden|$(PERL)|g' \
   -e 's|@address@hidden|$(EGREP)|g' \
   -e 's|@address@hidden|$(FGREP)|g' \
diff --git a/tests/defs b/tests/defs
index e925222..14648f5 100644
--- a/tests/defs
+++ b/tests/defs
@@ -657,6 +657,7 @@ fetch_tap_driver ()
       sed "1s|#!.*|#! $PERL -w|" "$am_scriptdir"/tap-driver.pl >tap-driver
       ;;
     shell)
+      AM_TAP_AWK=$AWK; export AM_TAP_AWK
       sed "1s|#!.*|#! $SHELL|" "$am_scriptdir"/tap-driver.sh >tap-driver
       ;;
     *)
@@ -797,14 +798,17 @@ do
     gcj)
       GCJ=$GNU_GCJ GCJFLAGS=$GNU_GCJFLAGS; export GCJ GCJFLAGS
       test "$GCJ" = false && skip_all_ "GNU Java compiler unavailable"
+      : For shells with busted 'set -e'.
       ;;
     gcc)
       CC=$GNU_CC CFLAGS=$GNU_CFLAGS; export CC CFLAGS CPPFLAGS
       test "$CC" = false && skip_all_ "GNU C compiler unavailable"
+      : For shells with busted 'set -e'.
       ;;
     g++)
       CXX=$GNU_CXX CXXFLAGS=$GNU_CXXFLAGS; export CXX CXXFLAGS CPPFLAGS
       test "$CXX" = false && skip_all_ "GNU C++ compiler unavailable"
+      : For shells with busted 'set -e'.
       ;;
     gfortran)
       FC=$GNU_FC FCFLAGS=$GNU_FCFLAGS; export FC FCFLAGS
diff --git a/tests/defs-static.in b/tests/defs-static.in
index 80cd1fe..1ada923 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -142,6 +142,7 @@ SHELL=${AM_TESTSUITE_SHELL-'@SHELL@'}; export SHELL
 
 # User can override various tools used.  Prefer overriding specific for
 # that automake testsuite, if they are available.
+AWK=${AM_TESTSUITE_AWK-${AWK-'@AWK@'}}
 PERL=${AM_TESTSUITE_PERL-${PERL-'@PERL@'}}
 MAKE=${AM_TESTSUITE_MAKE-${MAKE-'make'}}
 YACC=${AM_TESTSUITE_YACC-${YACC-'@YACC@'}}
diff --git a/tests/parallel-tests-many.test b/tests/parallel-tests-many.test
index 752ba15..a09dbe5 100755
--- a/tests/parallel-tests-many.test
+++ b/tests/parallel-tests-many.test
@@ -87,14 +87,28 @@ END
 
 setup_data ()
 {
-  awk "
-    BEGIN {
-      print \"TESTS = \\\\\"
-      for (i = 1; i < $count; i = i + 1)
-        print \"  $deepdir/$tname-\" i \".test \\\\\"
-      print \"  $deepdir/$tname-\" i \".test\"
-    }
-  " > list-of-tests.am || Exit 99
+  # Use perl, not awk, to avoid errors like "awk: string too long"
+  # (seen e.g. with Solaris 10 /usr/bin/awk).
+  count=$count deepdir=$deepdir tname=$tname $PERL -e '
+    use warnings FATAL => "all";
+    use strict;
+    print "TESTS = \\\n";
+    my $i = 0;
+    while (++$i)
+      {
+        print "  $ENV{deepdir}/$ENV{tname}-$i.test";
+        if ($i >= $ENV{count})
+          {
+            print "\n";
+            last;
+          }
+        else
+          {
+            print " \\\n";
+          }
+      }
+  ' > list-of-tests.am || Exit 99
+  sed 20q list-of-tests.am || Exit 99 # For debugging.
   $AUTOMAKE Makefile \
     || framework_failure_ "unexpected automake failure"
   ./config.status Makefile \


hooks/post-receive
-- 
GNU Automake