[Automake-commit] [SCM] GNU Automake branch, micro, updated. v1.14-11-g1a24c54

[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=1a24c5400c68c6cf3959c8ec5134ca79d0daad43

The branch, micro has been updated
       via  1a24c5400c68c6cf3959c8ec5134ca79d0daad43 (commit)
       via  43831406be5beb7d83c7798db9c96fd164b0c51d (commit)
       via  db6cb1847233d56c965a6d1e196dfb09f860ee97 (commit)
       via  0ac06406dcc6cf9c5f1fbeef340764e73cc8eae0 (commit)
       via  ac0e09477ca1614892799c91c327fff0ba83ad19 (commit)
       via  958a8a47cfc18faaf86a8be9eec3dd8589ffd2bd (commit)
       via  e40a6145d47483802487e3dd13988c5b5069e18d (commit)
       via  3759f24379c98b984a56b52c7d23a2dfbf36efcf (commit)
       via  ec163633dd590bfdbd8d7fd147492081018507f7 (commit)
      from  69a3cf8933372fa7ee155a284048e40e0939d586 (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 1a24c5400c68c6cf3959c8ec5134ca79d0daad43
Merge: 4383140 db6cb18
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jul 23 20:39:14 2013 +0100

    Merge branch 'fix-pr14911' into micro
    
    * fix-pr14911:
      test: avoid false positives in 'cc-no-c-o' script

commit 43831406be5beb7d83c7798db9c96fd164b0c51d
Merge: 0ac0640 ac0e094
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jul 23 20:39:06 2013 +0100

    Merge branch 'fix-half-pr14760' into micro
    
    * fix-half-pr14760:
      tests: fix a spurious failure on NetBSD-current

commit db6cb1847233d56c965a6d1e196dfb09f860ee97
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jul 21 13:46:48 2013 +0100

    test: avoid false positives in 'cc-no-c-o' script
    
    Fixes automake bug#14911.
    
    * t/ax/cc-no-c-o.in: Be more careful in determining whether both the
    '-c' and '-o' options have been passed on the command line to the
    compiler.  In particular, do not spuriously complain in the face of
    options like '-compatibility_version' or '-current_version' (seen on
    Mac OS X 10.7).
    * THANKS: Update.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 0ac06406dcc6cf9c5f1fbeef340764e73cc8eae0
Author: Stefano Lattarini <address@hidden>
Date:   Sat Jul 13 23:50:15 2013 +0100

    test harness: improve catching of usage errors in script 'test-driver'
    
    Fixes automake bug#14840.
    
    * lib/test-driver: Catch and report usage errors where the caller has
    forgotten to specify one of the mandatory options (--test-name,
    --log-file, --trs-file) or has not passed any non-option argument.
    Also, be sure to work correctly even when no '--' special argument
    is passed to separate option from non-options arguments.
    * THANKS: Update.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit ac0e09477ca1614892799c91c327fff0ba83ad19
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jul 7 11:37:37 2013 +0100

    tests: fix a spurious failure on NetBSD-current
    
    Reported in automake bug#14760.
    
    * tests/silent-custom.sh: Be prepared to handle creative
    quoting in the output of the shell run for the make recipes
    when the shell traces are active ("set -x").
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 958a8a47cfc18faaf86a8be9eec3dd8589ffd2bd
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jun 28 19:56:43 2013 +0200

    am-ft: make the environment available earlier
    
    So that, with a PATH that is updated earlier, we can find the 'xz'
    program even on systems where it isn't in the default PATH.
    
    * maintainer/am-ft: Adjust accordingly.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit e40a6145d47483802487e3dd13988c5b5069e18d
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jun 27 15:00:10 2013 +0200

    NEWS: post-release tweaks (for 1.14.x series)
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 3759f24379c98b984a56b52c7d23a2dfbf36efcf
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jun 27 14:43:12 2013 +0200

    tests: avoid a spurious failure on MacOS X 10.6.8
    
    Fixes automake bug#14706.
    
    * t/depcomp2.sh: Strip, from the redirected ./configure stderr, the
    possible error message "rm: conftest.dSYM: is a directory", generated
    by cleanup code that doesn't cater to the existence of *.dSYM
    directories sometimes created by the compiler on MacOS X.  This
    "massaging" of ./configure stderr is legitimate, since the spurious
    error message is due not to automake-related code, but to a know
    buglet/limitation of either Autoconf or Mac OS X bundles gcc:
    <http://lists.gnu.org/archive/html/bug-autoconf/2007-11/msg00017.html>
    Actually, from that link it appears that the original Autoconf issue
    had been fixed, but it must have been re-introduced in the meantime :-(
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit ec163633dd590bfdbd8d7fd147492081018507f7
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jun 27 11:11:35 2013 +0200

    tests: don't risk hanging on the 'cl' requirement
    
    On the GNU/Linux boxes of some users that run our testsuite there
    is a '/usr/local/bin/cl' executable, from the IRAF package:
    
        <http://iraf.noao.edu/>
    
    The test 'compile4.sh' (and other tests) try to invoke the 'cl'
    command to check whether it's a Microsoft compiler; the IRAF cl
    is an interactive program, so it hangs on such invocation.  In
    conclusion, the testsuite hangs for those users which have the
    IRAF cl early in PATH.
    
    Fix the issue by redirecting the input of cl from /dev/null when
    invoking it, which is enough to prevent the cl program from IRAF
    from hanging, and should have no effect on the behaviour of the
    Microsoft compiler.
    
    This change fixes automake bug#14707.
    
    * t/ax/am-test-lib.sh (require_tool): Adjust the handling of
    the 'cl' requirement.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 NEWS                |    9 +++------
 THANKS              |    2 ++
 lib/test-driver     |   20 ++++++++++++++++----
 maintainer/am-ft    |    6 +++---
 t/ax/am-test-lib.sh |    6 +++++-
 t/ax/cc-no-c-o.in   |   20 ++++++++++++++++----
 t/depcomp2.sh       |    5 ++++-
 t/silent-custom.sh  |   14 ++++++++++++--
 8 files changed, 61 insertions(+), 21 deletions(-)

diff --git a/NEWS b/NEWS
index 39ad7a3..9ec55df 100644
--- a/NEWS
+++ b/NEWS
@@ -31,12 +31,9 @@
 
   - According to this new scheme, the next major version of Automake
     (the one that had previously been labelled as "1.14") will actually
-    become "Automake 2.0".  Automake 1.14 is *this* release (which is
-    a minor one).  It introduces new features, deprecations and bug
-    fixes, but no serious backward incompatibility.  A partial exception
-    is given by the behavioural changes in the AM_PROG_CC_C_O macro
-    (described in details below) but such changes can also be seen as a
-    fix for the old suboptimal and somewhat confusing behaviour.
+    become "Automake 2.0".  Automake 1.14 has already been released as
+    the last minor release, and the present one is a bug-fixing release
+    following up on that one.
 
   - See discussion about automake bug#13578 for more details and
     background: <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13578>
diff --git a/THANKS b/THANKS
index cc5e238..1482da2 100644
--- a/THANKS
+++ b/THANKS
@@ -145,6 +145,7 @@ Gwenole Beauchesne              address@hidden
 H.J. Lu                         address@hidden
 H.Merijn Brand                  address@hidden
 Hans Ulrich Niedermann          address@hidden
+Hanspeter Niederstrasser        address@hidden
 Harald Dunkel                   address@hidden
 Harlan Stenn                    address@hidden
 He Li                           address@hidden
@@ -405,6 +406,7 @@ Ulrich Drepper                  address@hidden
 Ulrich Eckhardt                 address@hidden
 Václav Haisman                  address@hidden
 Vadim Zeitlin                   address@hidden
+Vasyl Khalak                    address@hidden
 Vincent Lefevre                 address@hidden
 Vladimir Serbinenko             address@hidden
 Volker Boerchers                address@hidden
diff --git a/lib/test-driver b/lib/test-driver
index 32bf39e..d306056 100755
--- a/lib/test-driver
+++ b/lib/test-driver
@@ -1,7 +1,7 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2012-06-27.10; # UTC
+scriptversion=2013-07-13.22; # UTC
 
 # Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
@@ -44,13 +44,12 @@ print_usage ()
 Usage:
   test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
               [--expect-failure={yes|no}] [--color-tests={yes|no}]
-              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+              [--enable-hard-errors={yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
 END
 }
 
-# TODO: better error handling in option parsing (in particular, ensure
-# TODO: $log_file, $trs_file and $test_name are defined).
 test_name= # Used for reporting.
 log_file=  # Where to save the output of the test script.
 trs_file=  # Where to save the metadata of the test run.
@@ -69,10 +68,23 @@ while test $# -gt 0; do
   --enable-hard-errors) enable_hard_errors=$2; shift;;
   --) shift; break;;
   -*) usage_error "invalid option: '$1'";;
+   *) break;;
   esac
   shift
 done
 
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+
 if test $color_tests = yes; then
   # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
   red='' # Red.
diff --git a/maintainer/am-ft b/maintainer/am-ft
index 1d22790..bb07c16 100755
--- a/maintainer/am-ft
+++ b/maintainer/am-ft
@@ -104,8 +104,7 @@ ssh -t -t $remote "
       || rm -rf $distdir || exit 1
     test ! -e $distdir
   fi
-  xz -dc $tarball | tar xf -
-  cd $distdir
+  export $env
   "'
   am_extra_acdir=$HOME/.am-test/extra-aclocal
   am_extra_bindir=$HOME/.am-test/extra-bin
@@ -117,7 +116,8 @@ ssh -t -t $remote "
     export PATH=$am_extra_bindir:$PATH
   fi
   '"
-  export $env
+  xz -dc $tarball | tar xf -
+  cd $distdir
   if test -f \"\$am_extra_setup\"; then
     . \"\$am_extra_setup\"
   fi
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index 182b070..26e58ef 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -788,7 +788,11 @@ require_tool ()
       # in the environment "by hand" before calling the testsuite.
       export CC CPPFLAGS
       echo "$me: running $CC -?"
-      $CC -? || skip_all_ "Microsoft C compiler '$CC' not available"
+      # The IRAF package (http://iraf.noao.edu/) contains a 'cl' program
+      # which is interactive, and which could cause the testsuite to hang
+      # if its standard input is not redirected.  See automake bug#14707.
+      $CC -? </dev/null \
+        || skip_all_ "Microsoft C compiler '$CC' not available"
       ;;
     etags)
       # Exuberant Ctags will create a TAGS file even
diff --git a/t/ax/cc-no-c-o.in b/t/ax/cc-no-c-o.in
index c18f9b9..bbc9ec9 100644
--- a/t/ax/cc-no-c-o.in
+++ b/t/ax/cc-no-c-o.in
@@ -19,11 +19,23 @@
 
 am_CC=${AM_TESTSUITE_GNU_CC-'@GNU_CC@'}
 
-case " $* " in
- *\ -c*\ -o* | *\ -o*\ -c*)
+seen_c=false
+seen_o=false
+
+for arg
+do
+  case $arg in
+    -c)
+      seen_c=true;;
+    # It is acceptable not to leave a space between the '-o' option
+    # and its argument, so we have to cater for that.
+    -o|-o*)
+      seen_o=true;;
+  esac
+  if $seen_c && $seen_o; then
     echo "$0: both '-o' and '-c' seen on the command line" >&2
     exit 2
-    ;;
-esac
+  fi
+done
 
 exec $am_CC "$@"
diff --git a/t/depcomp2.sh b/t/depcomp2.sh
index 2182164..3eba12d 100644
--- a/t/depcomp2.sh
+++ b/t/depcomp2.sh
@@ -45,6 +45,9 @@ $AUTOMAKE --add-missing
 $AUTOCONF
 ./configure 2>stderr || { cat stderr >&2; exit 1; }
 cat stderr >&2
-test ! -s stderr
+# Ignore warning messages sometimes seen on Mac OS X; they are
+# not automake's fault anyway, but either autoconf's or Mac's.
+sed '/rm:.* conftest\.dSYM/d' stderr >stderr2
+test -s stderr2 && { cat stderr2; exit 1; }
 
 :
diff --git a/t/silent-custom.sh b/t/silent-custom.sh
index 7ce3ffc..b00e388 100644
--- a/t/silent-custom.sh
+++ b/t/silent-custom.sh
@@ -80,8 +80,18 @@ do_check ()
   else
     $FGREP 'GEN ' output && exit 1
     $FGREP 'cp ./foo.in foo' output
-    $FGREP "rm -f sub/0.h sub/1.h sub/2.h" output
-    $FGREP "generate-header --flags sub/0.h sub/1.h sub/2.h" output
+    # Be prepared to handle "creative quoting" in the shell traces.
+    # See automake bug#14760.
+    ok=false
+    for q in '' \' \"; do
+      files="${q}sub/0.h${q} ${q}sub/1.h${q} ${q}sub/2.h${q}"
+      $FGREP "rm -f $files" output || continue
+      $FGREP "generate-header --flags $files" output || continue
+      ok=:
+      break
+    done
+    $ok || exit 1
+    unset ok
   fi
 }
 


hooks/post-receive
-- 
GNU Automake