[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, minor, updated. v1.14-42-g5
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, minor, updated. v1.14-42-g526c4b0 |
|
Date: |
Tue, 24 Dec 2013 14:46:33 +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=526c4b04a699fd62da6bc3915cdb333f0a6ca92d
The branch, minor has been updated
via 526c4b04a699fd62da6bc3915cdb333f0a6ca92d (commit)
via 39a0a5de8c5d3cb130e4681b2b31d849daf2b761 (commit)
via 5a29051fa9b6f4a20df041ba7221796e31bf8342 (commit)
via ba4b42faff673e3e5265416dff09e59affc688fb (commit)
via 055893bae6dcc19ae52bdc64f5c817c50865d19a (commit)
via 20bcc91242f89bc7c14385209be19a9336bf7471 (commit)
via 9d9aa6d158d85c1c95aed63fd5633977f29d668f (commit)
via 1a4a80fc249a0aab792e59eb301982ef2da63222 (commit)
via 2f248b0bc6047142649696e22627c584b9a2cdf5 (commit)
via a5253365f38883f3a21e2bfc595a6c58401794e7 (commit)
from 4527bb9a806a720f80ed13bb3829ba73cc014966 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
HACKING | 2 +-
INSTALL | 4 +-
NEWS | 42 ----------------
configure.ac | 4 +-
lib/INSTALL | 4 +-
lib/config.guess | 30 ++++++++----
lib/config.sub | 17 ++++--
lib/tap-driver.sh | 9 ++--
maintainer/am-ft | 6 ++
t/install-info-dir.sh | 12 +++--
t/list-of-tests.mk | 1 -
t/tap-realtime.sh | 127 -------------------------------------------------
12 files changed, 55 insertions(+), 203 deletions(-)
delete mode 100644 t/tap-realtime.sh
diff --git a/HACKING b/HACKING
index fdadada..1116b97 100644
--- a/HACKING
+++ b/HACKING
@@ -111,7 +111,7 @@
should have the major version number unchanged, the minor version number
bumped, and the micro version number reset to zero. Finally, a new
micro version should have the major and minor version numbers unchanged,
- and the micro version number bumped.
+ and the micro version number bumped by one.
For example, the first minor version after 1.13.2 will be 1.14; the
first bug-fixing version after 1.14 that will be 1.14.1; the first
diff --git a/INSTALL b/INSTALL
index 007e939..2099840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,8 +12,8 @@ without warranty of any kind.
Basic Installation
==================
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
+ Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
diff --git a/NEWS b/NEWS
index db9fdd4..5cc0019 100644
--- a/NEWS
+++ b/NEWS
@@ -1,45 +1,3 @@
-* WARNING: New versioning scheme for Automake.
-
- - Beginning with the release 1.13.2, Automake has started to use a
- more rational versioning scheme, that should allow users to know
- which kind of changes can be expected from a new version, based
- on its version number.
-
- + Micro releases (e.g., 1.13.3, 2.0.1, 3.2.8) introduce only bug
- and regression fixes and documentation updates; they should not
- introduce new features, nor any backward-incompatibility (any
- such incompatibility would be considered a bug, to be fixed with
- a further micro release).
-
- + Minor releases (e.g., 1.14, 2.1) can introduce new backward
- compatible features; the only backward-incompatibilities allowed
- in such a release are new *non-fatal* deprecations and warnings,
- and possibly fixes for old or non-trivial bugs (or even inefficient
- behaviours) that could unfortunately have been seen and used by
- some as "corner case features". Possible disruptions caused by
- this kind of fixes should hopefully be quite rare, and their
- effects limited in scope.
-
- + Major versions (now expected to be released every 18 or 24 months,
- and not more often) can introduce new big features (possibly with
- rough edges and not-fully-stabilized APIs), removal of deprecated
- features, backward-incompatible changes of behaviour, and possibly
- major refactorings (that, while ideally transparent to the user,
- could introduce new bugs). Incompatibilities should however not
- be introduced gratuitously and abruptly; a proper deprecation path
- should be duly implemented in the preceding minor releases.
-
- - 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 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>
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
* WARNING: Future backward-incompatibilities!
- Makefile recipes generated by Automake 2.0 will expect to use an
diff --git a/configure.ac b/configure.ac
index 7c470ed..a294aee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,8 +42,8 @@ dnl the automake options to avoid bloating and potential
problems.
AM_INIT_AUTOMAKE([-Wall -Werror dist-xz filename-length-max=99
no-define no-dependencies])
-## Keep this on a line of its own, since it must be found and processed
-## by the 'update-copyright' rule in our Makefile.
+# Keep this on a line of its own, since it must be found and processed
+# by the 'update-copyright' rule in our Makefile.
RELEASE_YEAR=2013
AC_SUBST([RELEASE_YEAR])
diff --git a/lib/INSTALL b/lib/INSTALL
index 007e939..2099840 100644
--- a/lib/INSTALL
+++ b/lib/INSTALL
@@ -12,8 +12,8 @@ without warranty of any kind.
Basic Installation
==================
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
+ Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
diff --git a/lib/config.guess b/lib/config.guess
index b79252d..9afd676 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2013-06-10'
+timestamp='2013-11-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1260,16 +1260,26 @@ EOF
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- case $UNAME_PROCESSOR in
- i386) UNAME_PROCESSOR=x86_64 ;;
- powerpc) UNAME_PROCESSOR=powerpc64 ;;
- esac
+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif')
| \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
fi
+ elif test "$UNAME_PROCESSOR" = i386 ; then
+ # Avoid executing cc on OS X 10.9, as it ships with a stub
+ # that puts up a graphical alert prompting to install
+ # developer tools. Any system running Mac OS X 10.7 or
+ # later (Darwin 11 and later) is required to have a 64-bit
+ # processor. This is not true of the ARM version of Darwin
+ # that Apple uses in portable devices.
+ UNAME_PROCESSOR=x86_64
fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
diff --git a/lib/config.sub b/lib/config.sub
index 8b612ab..61cb4bc 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2013-04-24'
+timestamp='2013-10-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -257,7 +257,7 @@ case $basic_machine in
| avr | avr32 \
| be32 | be64 \
| bfin \
- | c4x | clipper \
+ | c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
| fido | fr30 | frv \
@@ -265,6 +265,7 @@ case $basic_machine in
| hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | k1om \
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -324,7 +325,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -372,7 +373,7 @@ case $basic_machine in
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
- | clipper-* | craynv-* | cydra-* \
+ | c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -381,6 +382,7 @@ case $basic_machine in
| hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | k1om-* \
| le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
@@ -794,7 +796,7 @@ case $basic_machine in
os=-mingw64
;;
mingw32)
- basic_machine=i386-pc
+ basic_machine=i686-pc
os=-mingw32
;;
mingw32ce)
@@ -830,7 +832,7 @@ case $basic_machine in
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
msys)
- basic_machine=i386-pc
+ basic_machine=i686-pc
os=-msys
;;
mvs)
@@ -1546,6 +1548,9 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
+ c8051-*)
+ os=-elf
+ ;;
hexagon-*)
os=-elf
;;
diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh
index 19aa531..ee61fc1 100755
--- a/lib/tap-driver.sh
+++ b/lib/tap-driver.sh
@@ -23,7 +23,7 @@
# bugs to <address@hidden> or send patches to
# <address@hidden>.
-scriptversion=2011-12-27.17; # UTC
+scriptversion=2013-12-23.17; # UTC
# Make unconditional expansion of undefined variables an error. This
# helps a lot in preventing typo-related bugs.
@@ -53,7 +53,7 @@ Usage:
[--enable-hard-errors={yes|no}] [--ignore-exit]
[--diagnostic-string=STRING] [--merge|--no-merge]
[--comments|--no-comments] [--] TEST-COMMAND
-The \`--test-name', \`--log-file' and \`--trs-file' options are mandatory.
+The '--test-name', '-log-file' and '--trs-file' options are mandatory.
END
}
@@ -153,8 +153,8 @@ fi
-v comments="$comments" \
-v diag_string="$diag_string" \
'
-# FIXME: the usages of "cat >&3" below could be optimized when using
-# FIXME: GNU awk, and/on on systems that supports /dev/fd/.
+# TODO: the usages of "cat >&3" below could be optimized when using
+# GNU awk, and/on on systems that supports /dev/fd/.
# Implementation note: in what follows, `result_obj` will be an
# associative array that (partly) simulates a TAP result object
@@ -209,7 +209,6 @@ function copy_in_global_log()
return 0
}
-# FIXME: this can certainly be improved ...
function get_global_test_result()
{
if ("ERROR" in test_results_seen)
diff --git a/maintainer/am-ft b/maintainer/am-ft
index bb07c16..81a1dc5 100755
--- a/maintainer/am-ft
+++ b/maintainer/am-ft
@@ -35,10 +35,14 @@ cmd='
remote=
interactive=1
+maybe_sleep=:
while test $# -gt 0; do
case $1 in
-b|--batch) interactive=0;;
-c|--command) cmd=${2-}; shift;;
+ # Useful to avoid spurious errors due to skewed clocks between
+ # the system where the tarball is built and the target system.
+ -S|--sleep) maybe_sleep="sleep ${2-}"; shift;;
-*) fatal "'$1': invalid option";;
*) remote=$1; shift; break;;
esac
@@ -92,6 +96,8 @@ set -x
scp $tarball $remote:tmp/
+$maybe_sleep
+
# Multiple '-t' to force tty allocation.
ssh -t -t $remote "
set -x; set -e; set -u;
diff --git a/t/install-info-dir.sh b/t/install-info-dir.sh
index b16824f..46a70b9 100644
--- a/t/install-info-dir.sh
+++ b/t/install-info-dir.sh
@@ -87,18 +87,19 @@ if test $have_installinfo = yes; then
$MAKE install-info
test -f $instdir/info/foo.info
- test -f $instdir/info/dir
+ cat $instdir/info/dir
$FGREP 'Does nothing at all, but has a nice name' $instdir/info/dir
$MAKE uninstall
test ! -e $instdir/info/foo.info
+ cat $instdir/info/dir
$FGREP 'but has a nice name' $instdir/info/dir && exit 1
dir="$destdir/$cwd/$instdir/info"
$MAKE DESTDIR="$cwd/$destdir" install-info
test -f "$dir"/foo.info
- test -f "$dir"/dir
+ cat "$dir"/dir
$FGREP 'Does nothing at all, but has a nice name' "$dir"/dir
$MAKE DESTDIR="$cwd/$destdir" uninstall
test ! -e "$dir"/foo.info
@@ -141,10 +142,10 @@ if test $have_installinfo = yes; then
END
$MAKE install-info
test -f $instdir/info/foo.info
- test -f $instdir/info/dir
+ cat $instdir/info/dir
$MAKE uninstall
test ! -e $instdir/info/foo.info
- test -f $instdir/info/dir
+ cat $instdir/info/dir
$FGREP 'but has a nice name' $instdir/info/dir && exit 1
: For shells with busted 'set -e'.
fi
@@ -169,6 +170,7 @@ fi
chmod a-w $instdir/info/dir
for val in no NO n; do
env AM_UPDATE_INFO_DIR="$val" $MAKE uninstall
+ cat $instdir/info/dir
$FGREP 'Does nothing at all, but has a nice name' $instdir/info/dir
done
@@ -177,7 +179,7 @@ if test $have_installinfo = yes; then
rm -rf $instdir
env AM_UPDATE_INFO_DIR="$val" $MAKE install-info
test -f $instdir/info/foo.info
- test -f $instdir/info/dir
+ cat $instdir/info/dir
env AM_UPDATE_INFO_DIR="$val" $MAKE uninstall
test ! -e $instdir/info/foo.info
$FGREP 'but has a nice name' $instdir/info/dir && exit 1
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 75f303a..462497e 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -1149,7 +1149,6 @@ t/tap-planskip-whitespace.sh \
t/tap-planskip-badexit.sh \
t/tap-planskip-bailout.sh \
t/tap-planskip-later-errors.sh \
-t/tap-realtime.sh \
t/tap-test-number-0.sh \
t/tap-recheck-logs.sh \
t/tap-result-comment.sh \
diff --git a/t/tap-realtime.sh b/t/tap-realtime.sh
deleted file mode 100644
index e9b2b0c..0000000
--- a/t/tap-realtime.sh
+++ /dev/null
@@ -1,127 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011-2013 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# TAP support:
-# - testsuite progress on console should happen mostly "in real time";
-# i.e., it's not acceptable for the driver to wait the end of the
-# script to start displaying results from it.
-# FIXME: this test uses expect(1) to ensure line buffering from make and
-# children, and is pretty hacky and complex; is there a better way to
-# accomplish the checks done here?
-
-. test-init.sh
-
-cat >expect-check <<'END'
-eval spawn $env(SHELL) -c ":"
-expect eof
-END
-expect -f expect-check || {
- echo "$me: failed to find a working expect program" >&2
- exit 77
-}
-rm -f expect-check
-
-# Unfortunately, some make implementations (among them, FreeBSD make,
-# NetBSD make, and Solaris Distributed make), when run in parallel mode,
-# serialize the output from their targets' recipes unconditionally. In
-# such a situation, there's no way the partial results of a TAP test can
-# be displayed until the test has terminated. And this is not something
-# our TAP driver script can work around; in fact, the driver *is* sending
-# out its output progressively and "in sync" with test execution -- it is
-# make that is stowing such output away instead of presenting it to the
-# user as soon as it gets it.
-if ! using_gmake; then
- case $MAKE in
- *\ -j*) skip_ "doesn't work with non-GNU concurrent make";;
- esac
- # Prevent Sun Distributed Make from trying to run in parallel.
- DMAKE_MODE=serial; export DMAKE_MODE
-fi
-
-cat > Makefile.am << 'END'
-TESTS = all.test
-AM_COLOR_TESTS= no
-END
-
-. tap-setup.sh
-
-cat > all.test <<'END'
-#! /bin/sh
-echo 1..3
-
-# Creative quoting to placate maintainer-check.
-sleep="sleep "3
-
-# The awk+shell implementation of the TAP driver must "read ahead" of one
-# line in order to catch the exit status of the test script it runs. So
-# be sure to echo one "dummy" line after each result line in order not to
-# cause false positives.
-
-echo ok 1 - foo
-echo DUMMY
-$sleep
-test -f ok-1 || { echo 'Bail out!'; exit 1; }
-
-echo ok 2 - bar
-echo DUMMY
-$sleep
-test -f ok-2 || { echo 'Bail out!'; exit 1; }
-
-echo ok 3 - baz
-echo DUMMY
-$sleep
-test -f ok-3 || { echo 'Bail out!'; exit 1; }
-
-: > all-is-well
-END
-
-chmod a+x all.test
-
-cat > expect-make <<'END'
-eval spawn $env(MAKE) check
-expect {
- "PASS: all.test 1 - foo" {
- open "ok-1" "w"
- exp_continue
- }
- "PASS: all.test 2 - bar" {
- open "ok-2" "w"
- exp_continue
- }
- "PASS: all.test 3 - baz" {
- open "ok-3" "w"
- exp_continue
- }
- "Testsuite summary" {
- exit 0
- }
- timeout {
- puts "expect timed out"
- exit 1
- }
- default {
- puts "expect error"
- exit 1
- }
-}
-END
-
-# Expect should simulate a tty as stdout, which should ensure a
-# line-buffered output.
-MAKE=$MAKE expect -f expect-make
-test -f all-is-well
-
-:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, minor, updated. v1.14-42-g526c4b0,
Stefano Lattarini <=