Merge branch 'fix-half-pr14760' into micro

* fix-half-pr14760:
  tests: fix a spurious failure on NetBSD-current

diff --git a/NEWS b/NEWS
index 39ad7a3..9ec55df 100644 (file)
--- 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..b708943 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -405,6 +405,7 @@ Ulrich Drepper                  drepper@gnu.ai.mit.edu
 Ulrich Eckhardt                 eckhardt@satorlaser.com
 Václav Haisman                  V.Haisman@sh.cvut.cz
 Vadim Zeitlin                   Vadim.zeitlin@dptmaths.ens-cachan.fr
+Vasyl Khalak                    basiliomail@gmail.com
 Vincent Lefevre                 vincent@vinc17.org
 Vladimir Serbinenko             phcoder@gmail.com
 Volker Boerchers                vboerchers@tecon.de

diff --git a/lib/test-driver b/lib/test-driver
index 32bf39e..d306056 100755 (executable)
--- 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='\e[0;31m' # Red.

diff --git a/maintainer/am-ft b/maintainer/am-ft
index 1d22790..bb07c16 100755 (executable)
--- 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 (file)
--- 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/depcomp2.sh b/t/depcomp2.sh
index 2182164..3eba12d 100644 (file)
--- 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; }
 
 :