[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.14-137-
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.14-137-gb7bdb2c |
|
Date: |
Wed, 30 Oct 2013 01:06:16 +0000 |
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=b7bdb2c3f2fb66a2384123670fb47b83d30c4bf9
The branch, master has been updated
via b7bdb2c3f2fb66a2384123670fb47b83d30c4bf9 (commit)
via 82216ce83ba3cdf3572b58e4d9e84886ab02d22d (commit)
via 8a310a5fa5a908cf8771e44431e5743fb0e8b026 (commit)
via 1e2f142fff20f126644b42ded42c12614114aab3 (commit)
via 8dbdc495503a3a689d1396326c212af26a5a00ca (commit)
via 7a8b3b0c6b28626b7c62354973e923f4aa579743 (commit)
via 2c063f33aece0afa0ee5c10d94aed6fa722c5ea9 (commit)
via 8c554e1ffea9ca414ac3e0c09437ef91a8edcfc1 (commit)
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 d26663f638eef5acfa9605db7a338fd3675dba1c (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 b7bdb2c3f2fb66a2384123670fb47b83d30c4bf9
Merge: d26663f 82216ce
Author: Stefano Lattarini <address@hidden>
Date: Wed Oct 30 01:04:24 2013 +0000
Merge branch 'minor'
* minor:
tests: fix spurious failure when zip is present but unzip is not
tests: fix spurious failure due to localization issues
NEWS: update with the changes since v1.14
docs: correct typos in the fix-timestamp.sh script
python: byte-compile nobase_*_PYTHON files only once
cosmetics: typofix in the 'missing' script
test: avoid false positives in 'cc-no-c-o' script
test harness: improve catching of usage errors in script 'test-driver'
tests: fix a spurious failure on NetBSD-current
am-ft: make the environment available earlier
NEWS: post-release tweaks (for 1.14.x series)
tests: avoid a spurious failure on MacOS X 10.6.8
tests: don't risk hanging on the 'cl' requirement
-----------------------------------------------------------------------
Summary of changes:
NEWS | 32 ++++++++++++++++++++----
THANKS | 5 ++++
doc/automake.texi | 4 +-
lib/am/python.am | 12 ++++----
lib/missing | 4 +-
lib/test-driver | 20 ++++++++++++---
maintainer/am-ft | 6 ++--
t/autohdr-subdir-pr12495.sh | 4 +++
t/ax/am-test-lib.sh | 6 ++++-
t/ax/cc-no-c-o.in | 20 ++++++++++++---
t/depcomp2.sh | 5 +++-
t/dist-formats.tap | 54 +++++++++++++++++++++++--------------------
t/silent-custom.sh | 14 +++++++++-
13 files changed, 130 insertions(+), 56 deletions(-)
diff --git a/NEWS b/NEWS
index 56ae09c..f8f415f 100644
--- a/NEWS
+++ b/NEWS
@@ -89,12 +89,9 @@ New in 2.0:
- 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>
@@ -165,6 +162,29 @@ New in 2.0:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+New in 1.14.1:
+
+* Bugs fixed:
+
+ - Fixed a gross inefficiency in the recipes for installing byte-compiled
+ python files, that was causing an O(N^2) performance on the number N of
+ files, instead of the expected O(N) performance. Note that this bug
+ was only relevant when the number of python files was high (which is
+ unusual in practice).
+
+ - The 'test-driver' script now actually error out with a clear error
+ message on the most common invalid usages.
+
+ - Several spurious failures/hangs in the testsuite (bugs #14706, #14707,
+ #14760, #14911, #15181, #15237).
+
+* Documentation fixes:
+
+ - Fixed typos in the 'fix-timestamp.sh' example script that made it
+ nonsensical.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
New in 1.14:
* C compilation, and the AC_PROG_CC and AM_PROG_CC_C_O macros:
diff --git a/THANKS b/THANKS
index cc5e238..6be803e 100644
--- a/THANKS
+++ b/THANKS
@@ -17,6 +17,7 @@ Alexander Turbov address@hidden
Alexandre Duret-Lutz address@hidden
Alexey Mahotkin address@hidden
Alfred M. Szmidt address@hidden
+Andrea Urbani address@hidden
Andreas Bergmeier address@hidden
Andreas Buening address@hidden
Andreas Köhler address@hidden
@@ -145,6 +146,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
@@ -404,10 +406,13 @@ Tom Rini address@hidden
Ulrich Drepper address@hidden
Ulrich Eckhardt address@hidden
Václav Haisman address@hidden
+Václav Zeman address@hidden
Vadim Zeitlin address@hidden
+Vasyl Khalak address@hidden
Vincent Lefevre address@hidden
Vladimir Serbinenko address@hidden
Volker Boerchers address@hidden
+Weiller Ronfini address@hidden
Werner John address@hidden
Werner Koch address@hidden
Werner Lemberg address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index 673c1f0..41b2f6d 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -11672,9 +11672,9 @@ touch aclocal.m4
sleep 1
# autoconf-generated configure depends on aclocal.m4 and on
# configure.ac
-configure config.h.in
+touch configure
# so does autoheader-generated config.h.in
-configure config.h.in
+touch config.h.in
# and all the automake-generated Makefile.in files
touch `find . -name Makefile.in -print`
# finally, the makeinfo-generated '.info' files depend on the
diff --git a/lib/am/python.am b/lib/am/python.am
index 36f0b2d..06545b1 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -66,7 +66,7 @@ else !%?BASE%
echo " $(MKDIR_P) '$(DESTDIR)$(%NDIR%dir)'"; \
$(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)" || exit 1; \
fi; \
- $(am__nobase_list) | while read dir files; do \
+ $(am__nobase_list) | { while read dir files; do \
xfiles=; for p in $$files; do \
## A file can be in the source directory or the build directory.
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
@@ -79,13 +79,13 @@ else !%?BASE%
## Don't perform translation, since script name is important.
echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(%NDIR%dir)/$$dir'"; \
$(INSTALL_DATA) $$xfiles "$(DESTDIR)$(%NDIR%dir)/$$dir" || exit
$$?; }; \
+ done; \
## Byte-compile must be done at install time, since file times are
## encoded in the actual files.
- if test -n "$$dlist"; then \
- $(am__py_compile) --destdir "$(DESTDIR)" \
- --basedir "$(%NDIR%dir)" $$dlist; \
- else :; fi \
- done
+ if test -n "$$dlist"; then \
+ $(am__py_compile) --destdir "$(DESTDIR)" \
+ --basedir "$(%NDIR%dir)" $$dlist; \
+ else :; fi; }
endif !%?BASE%
endif %?INSTALL%
diff --git a/lib/missing b/lib/missing
index cdea514..db98974 100755
--- a/lib/missing
+++ b/lib/missing
@@ -1,7 +1,7 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <address@hidden>, 1996.
@@ -160,7 +160,7 @@ give_advice ()
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
+ echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
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='[0;31m' # 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/autohdr-subdir-pr12495.sh b/t/autohdr-subdir-pr12495.sh
index 7e26b46..dcb9620 100644
--- a/t/autohdr-subdir-pr12495.sh
+++ b/t/autohdr-subdir-pr12495.sh
@@ -63,6 +63,10 @@ $MAKE
test -f a.h.in
test -f a.h
+# We might need to grep the output of GNU make for error messages.
+LANG=C LANGUAGE=C LC_ALL=C
+export LANG LANGUAGE LC_ALL
+
ocwd=$(pwd)
for x in b c; do
test $x = b || cd sub
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/dist-formats.tap b/t/dist-formats.tap
index 49281d9..3c9e621 100644
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -67,34 +67,38 @@ setup_vars_for_compression_format ()
have_compressor ()
{
test $# -eq 1 || fatal_ "have_compressor(): bad usage"
- case $1 in
+ if test $1 = gzip; then
# Assume gzip(1) is available on every reasonable portability target.
- gzip)
- return 0;;
- *)
- case $1 in
- # Do not use --version, or older versions bzip2 would try to
- # compress stdin. This would cause binary output in the test
- # logs, with potential breakage of our testsuite harness.
- bzip2) o=--help;;
- # OpenSolaris zip do not support the '--version' option, but
- # accepts the '-v' one with a similar meaning (if no further
- # arguments are given).
- zip) o=-v;;
- # Assume the other compressors we care about support the
- # '--version' option.
- *) o=--version;;
- esac
- # Redirect to stderr to avoid polluting the output, in case this
- # function is used in a command substitution (as it is, below).
- if $1 $o </dev/null >&2; then
- return 0
- else
- return 1
- fi
+ return 0
+ fi
+ needed_programs=$1
+ # Assume by default the other compressors we care about support the
+ # '--version' option. We'll special-case the one which don't.
+ checker_option=--version
+ case $1 in
+ bzip2)
+ # Do not use --version, or older versions bzip2 would try to
+ # compress stdin. This would cause binary output in the test
+ # logs, with potential breakage of our testsuite harness.
+ checker_option=--help
+ ;;
+ zip)
+ # OpenSolaris zip do not support the '--version' option, but
+ # accepts the '-v' one with a similar meaning (if no further
+ # arguments are given).
+ checker_option=-v
+ # Also, we need 'unzip' to decompress the created zipped archives
+ # (bug#15181).
+ needed_programs='zip unzip'
;;
esac
- fatal_ "have_compressor(): dead code reached"
+ # Redirect to stderr to avoid polluting the output, in case this
+ # function is used in a command substitution (as it is, later in
+ # this script).
+ for p in $needed_programs; do
+ $p $checker_option </dev/null >&2 || return 1
+ done
+ return 0
}
all_compression_formats='gzip lzip xz bzip2 zip'
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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.14-137-gb7bdb2c,
Stefano Lattarini <=