[SCM] GNU Libtool branch, master, updated. v2.4.2-250-g0b1b671
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 Libtool. The branch, master has been updated via 0b1b67186407f1b03cc0c5bf1882a8db8e0ee2e2 (commit) via d2dcd0094901ca961a4690647d17f887eb26208f (commit) via aab804836706faa5538b56f5b4bfe5af6f2b048b (commit) via a252d59d913c9635845721575695f78ca492757e (commit) via c0228e02d1ccced003b64c2c6efe13fc7cd793b5 (commit) via 2e7ba6d709a77471f5929cd8d347a86cc1fedd2d (commit) via 9053a05940aa5f697a86b423916365bd0c2cc523 (commit) via 59ec249278b51de01288d13fee3ede6f3b3b6ab4 (commit) via 8f0ee8aeeb474f717b073d18febe49351fa05f18 (commit) via 9a4cac834246b57f8a7c4883be4ad40345521b89 (commit) via 0d3ae556976d27c6998f31f1a99df91bcd5907af (commit) via d61e83993b58b935b1700dee1fa802990e76d397 (commit) via 3b802dd319883400f031f64f5e81fe34902d25d8 (commit) via de7482d17c1f9f731cbba3ec347903884acf2c65 (commit) via 934c0382de2f0e5bec53028281e2da6095d50872 (commit) via fd1151fe85235b89ed0023c2d894dd117efaa03c (commit) via 4e05284e5143fb8d8c19b9e0e50830f90132d7fe (commit) via 7ce429c52729130b360206c61396ffe2f5467134 (commit) via 7510fd8bedafad915a10bb7a50e9bd45c9a34f8e (commit) via 4440d6523bf9c668720f9ffa66fb89e91912a504 (commit) via 0fc275469ef020177d8dff2c041456f6b6155537 (commit) via 692bc68dc9a580647a164d6338ca7e13cb593966 (commit) via 6cb0d0d771bc1e3be402929b90ca7a8a16d4 (commit) via d50e123595d80b5582d0663ad50e3454051c482d (commit) via e0f66dc54d2f7906a2513c68d76362be4bcbbef3 (commit) via ae68608314993e81836257ac1eec449256decd53 (commit) via d576fa9da144f2e9ab14337c9590d4abfdea985f (commit) via 3cbc0e26f0a7f0bbea559912c3da920b4ead8e5e (commit) via 83d52fd6d2039c048f731133bec0ae8a1bf9382d (commit) via 1e70622d7c127b4dd90b3a5b0650d323ec2305fc (commit) via 1fcb9bc4e4b7b7166a6f45da633f813faee6e00f (commit) via bf6aa3082089d12bf4500b469c096263823a75b4 (commit) via 43acd6749a29f079452cfb70b6c6e1c8f1469128 (commit) via 8c6e33197e36463cb7fcf5d575a53c3f414ec4ff (commit) via 7db681a2696c75dc6c55261ea8fd11f92e42db2b (commit) via 59f8a3a6e1a26d501e5865f7611d8828aac5579c (commit) via f2a640f7e03e5dcf1510833a0e1e4991032b5f96 (commit) via 90529a55ef40653051730d3c20203fa2ad5e8f7f (commit) via d702946c65b309c389ae717a4d2d6fe158c3ee5f (commit) via 8392cd263e847a22b2409c35bf03d7c9e68d2cd0 (commit) via 430e782755bbe8061a5e7f9d856b33e3b7da3ac8 (commit) via d60b4387c178100b0bd3835c61d0f4771330bf6a (commit) via 47a889a4ca2009e2147fa5b2f95baefe1dca8288 (commit) via 8f975a1368594126e37d85511f1f96164e466d93 (commit) via f8a4b90f9a712f47b7627d2cf96eed74825df91f (commit) via b25625e6b25427dba80051b2924060b1e84ea73e (commit) via 3467227ccb6c99f4c2122b9fb3fa67d54b5bd54b (commit) via 8bfac9e3e82646868907aede4ebe4deb158a2e8a (commit) via baffe661910947df0dcd5a5bbd6512fc0bce59b9 (commit) via 822881fe3c69ca474b8e13d60243dd9c1a1c3fea (commit) via f7f249a0e6b5093b8752f1ba863345bfcd5a237e (commit) via c03789b8ee33f136d3bbd7f7a111ad863bb4c7e8 (commit) via 78385ffd8af73b927549c3596da67233f2f92f0e (commit) via 7d25536e80b68042a6d999c11a0c5c9dc948f82e (commit) via 7a2a8f32bb83d6b16db8436b530ec5e88fbd0751 (commit) via c5dec32e37e90ce46813efe7dfe8c5500cc55bbc (commit) via a2445f0fdbeaa72c18a893714e4437ea01faa08a (commit) via 0c953ba5cc71bd1de615df28fbf16e27be62244e (commit) via f32a760fbd40796be0b7e3be41226a82db1748d4 (commit) via a80878742dfd0f5127c1ddc5f803fab980eb816a (commit) via d56683630a6415e59f1be7a6540c4733e9671bd8 (commit) via ca821436009a93c2e8f3c5ce07ed23d90bbba49e (commit) via c7d7e46fbea7d6249680da71ecda1d84bdec858a (commit) via 156a851bc5d758f2d4d7fd89cef678ae72f35e77 (commit) via 87c4cffb19cf5ba8dc088e0ad357e5c3d4be2433 (commit) via c5230035e5df31976285bf36141d89236416230d (commit) via cb4ed2559e89354ea846a686543206d3445ea5ec (commit) via 9f3cec5b2ec476bd4fd978c1e23398b25d36cd2f (commit) via 5f27eeb0a37f15b32ccb1b97b2ed9022f5df9a60 (commit) via 013c91874e974543d2f58843c1e839ba102d6ee0 (commit) via 006695fed2e9cd10664c97c69880a82545dde1ef (commit) via ff3b32aed7db925a7390d92ffede055b4c8ccf18 (commit) via d43b40113ec1e8289e48d77f00e8947f2fd98fd4 (commit) from d674eaa44cc8ce0ea3d148cfd43f243c3c819e2d (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
[SCM] GNU Libtool branch, master, updated. v2.4.2-251-g9847559
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 Libtool.
The branch, master has been updated
via 9847559cef654e7ae587aea13b2a084ab2a5eb40 (commit)
from 0b1b67186407f1b03cc0c5bf1882a8db8e0ee2e2 (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 9847559cef654e7ae587aea13b2a084ab2a5eb40
Author: Gary V. Vaughan g...@gnu.org
Date: Thu Oct 4 20:04:32 2012 +0700
syntax-check: fix violations and implement sc_prohibit_space_semicolon.
No need for a spurious space before a command ending semi-colon.
* cfg.mk (sc_prohibit_space_semicolon): New test to catch
accidental reintroduction of spurious spaces removed by this
changeset.
* bootstrap, build-aux/general.m4sh, build-aux/ltmain.m4sh,
libltdl/lt__strl.c, m4/libtool.m4, m4/ltdl.m4, tests/bindir.at:
Remove spurious spaces.
Signed-off-by: Gary V. Vaughan g...@gnu.org
---
Summary of changes:
bootstrap |6 ++--
build-aux/general.m4sh |2 +-
build-aux/ltmain.m4sh | 76
cfg.mk |6
libltdl/lt__strl.c |6 ++--
m4/libtool.m4 | 18 ++--
m4/ltdl.m4 |4 +-
tests/bindir.at| 10 +++---
8 files changed, 67 insertions(+), 61 deletions(-)
diff --git a/bootstrap b/bootstrap
index 998d5a4..f02a5cf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1263,9 +1263,9 @@ func_require_gnulib_merge_changelog ()
$require_git
func_grep_q '^\(/\|\)ChangeLog$' .gitignore || test true = $GIT || {
-if $GIT config merge.merge-changelog.driver /dev/null ; then
+if $GIT config merge.merge-changelog.driver /dev/null; then
:
-elif (git-merge-changelog --version) /dev/null 21 ; then
+elif (git-merge-changelog --version) /dev/null 21; then
func_echo initializing git-merge-changelog driver
$GIT config merge.merge-changelog.name 'GNU-style ChangeLog merge
driver'
$GIT config merge.merge-changelog.driver 'git-merge-changelog %O %A
%B'
@@ -2141,7 +2141,7 @@ func_sort_ver ()
# Split on '.' and compare each component.
i=1
-while : ; do
+while :; do
p1=`echo $ver1 |cut -d. -f$i`
p2=`echo $ver2 |cut -d. -f$i`
if test ! $p1; then
diff --git a/build-aux/general.m4sh b/build-aux/general.m4sh
index cc1bce6..d930ace 100644
--- a/build-aux/general.m4sh
+++ b/build-aux/general.m4sh
@@ -313,7 +313,7 @@ func_normal_abspath ()
# Processed it all yet?
if test / = $func_normal_abspath_tpath; then
# If we ascended to the root using .. the result may be empty now.
- if test -z $func_normal_abspath_result ; then
+ if test -z $func_normal_abspath_result; then
func_normal_abspath_result=/
fi
break
diff --git a/build-aux/ltmain.m4sh b/build-aux/ltmain.m4sh
index 1692eb8..1a00e79 100644
--- a/build-aux/ltmain.m4sh
+++ b/build-aux/ltmain.m4sh
@@ -726,7 +726,7 @@ func_convert_core_path_wine_to_w32 ()
for func_convert_core_path_wine_to_w32_f in $1; do
IFS=$oldIFS
func_convert_core_file_wine_to_w32
$func_convert_core_path_wine_to_w32_f
- if test -n $func_convert_core_file_wine_to_w32_result ; then
+ if test -n $func_convert_core_file_wine_to_w32_result; then
if test -z $func_convert_core_path_wine_to_w32_result; then
func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
else
@@ -795,7 +795,7 @@ func_convert_file_check ()
{
$debug_cmd
- if test -z $2 test -n $1 ; then
+ if test -z $2 test -n $1; then
func_error Could not determine host file name corresponding to
func_error \`$1'
func_error Continuing, but uninstalled executables may not work.
@@ -2586,7 +2586,7 @@ extern \C\ {
if test -n $curr_lafile func_lalib_p $curr_lafile; then
# Use subshell, to avoid clobbering current variable values
dlprefile_dlname=`source $curr_lafile echo $dlname`
- if test -n $dlprefile_dlname ; then
+ if test -n $dlprefile_dlname; then
func_basename $dlprefile_dlname
dlprefile_dlbasename=$func_basename_result
else
@@ -2596,7 +2596,7 @@ extern \C\ {
fi
fi
$opt_dry_run || {
- if test -n $dlprefile_dlbasename ; then
+ if test -n $dlprefile_dlbasename; then
eval '$ECHO : $dlprefile_dlbasename $nlist'
else
[SCM] GNU Libtool branch, master, updated. v2.4.2-275-ga61a111
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 Libtool.
The branch, master has been updated
via a61a1114ae1464c39b54e88d1a30735c7daca4b2 (commit)
via 22f57507c736f67d78a001e3f0591cab0d9484fa (commit)
from e24f18306f92f7b31aa20f713924b740c0c850bc (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 a61a1114ae1464c39b54e88d1a30735c7daca4b2
Author: Peter Rosin p...@lysator.liu.se
Date: Fri Oct 5 21:43:45 2012 +0200
tests: make LT_AT_HOST_DATA retain whitespace on MinGW
Fixes issues with depdemo.at, f77demo.at and fcdemo.at.
* tests/testsuite.at (LT_AT_HOST_DATA) [MinGW]: Keep leading
and trailing spaces and tabs when converting line endings.
commit 22f57507c736f67d78a001e3f0591cab0d9484fa
Author: Peter Rosin p...@lysator.liu.se
Date: Fri Oct 5 21:31:33 2012 +0200
tests: fix line ending problems on MinGW
* tests/cdemo.at: Use LT_AT_HOST_DATA for expected output from
compiled programs.
* tests/demo.at: Likewise.
* tests/depdemo.at: Likewise.
* tests/f77demo.at: Likewise.
* tests/fcdemo.at: Likewise.
* tests/mdemo.at: Likewise.
* tests/tagdemo.at: Likewise.
Signed-off-by: Peter Rosin p...@lysator.liu.se
---
Summary of changes:
tests/cdemo.at |2 +-
tests/demo.at |4 ++--
tests/depdemo.at |2 +-
tests/f77demo.at |6 +++---
tests/fcdemo.at|4 ++--
tests/mdemo.at |4 ++--
tests/tagdemo.at |2 +-
tests/testsuite.at |3 +--
8 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/tests/cdemo.at b/tests/cdemo.at
index f50106c..885845c 100644
--- a/tests/cdemo.at
+++ b/tests/cdemo.at
@@ -117,7 +117,7 @@ int main ()
}
]])
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
[[Welcome to GNU libtool cdemo!
** This is libfoo **
hello returned: 57616
diff --git a/tests/demo.at b/tests/demo.at
index b79564a..b3d2532 100644
--- a/tests/demo.at
+++ b/tests/demo.at
@@ -339,7 +339,7 @@ int main ()
}
]])
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
[[Welcome to GNU Hell!
cos (0.0) = 1
** This is not GNU Hello. There is no built-in mail reader. **
@@ -901,7 +901,7 @@ int foo2 (void) {
}
]])
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
[[Welcome to GNU Hell!
cos (0.0) = 1
foo2 cos (0.0) = 1
diff --git a/tests/depdemo.at b/tests/depdemo.at
index 3c0666b..763bae4 100644
--- a/tests/depdemo.at
+++ b/tests/depdemo.at
@@ -240,7 +240,7 @@ for i in 1 2 3 4; do
done
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
[[dependencies:
l1 (0)
l2 (0)
diff --git a/tests/f77demo.at b/tests/f77demo.at
index 78da9a8..5978b3d 100644
--- a/tests/f77demo.at
+++ b/tests/f77demo.at
@@ -249,7 +249,7 @@ m4_define([_LT_CHECK_EXECUTE],
# on whether it is redirected to a file or sent to stdout, so we
# just check return status, and ignore output.
# Advice on this weirdness from a Fortran user much appreciated!
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
[[ Welcome to GNU libtool Fortran demo!
Real programmers write in FORTRAN.
fsub called
@@ -262,7 +262,7 @@ AT_DATA([expout],
]])
LT_AT_EXEC_CHECK([./fprogram], 0, [ignore])
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
[[Welcome to GNU libtool mixed C/Fortran demo!
The C subroutine returned, claiming that 2*2 = 4
The C subroutine is ok!
@@ -294,7 +294,7 @@ _LT_SETUP
LT_AT_CHECK_CONFIG([--disable-shared],
[^build_old_libs=yes], [^build_libtool_libs=no])
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
[[ Welcome to GNU libtool Fortran demo!
Real programmers write in FORTRAN.
fsub called
diff --git a/tests/fcdemo.at b/tests/fcdemo.at
index 3a545eb..0ade9bb 100644
--- a/tests/fcdemo.at
+++ b/tests/fcdemo.at
@@ -263,7 +263,7 @@ m4_define([_LT_CHECK_EXECUTE],
# on whether it is redirected to a file or sent to stdout, so we
# just check return status, and ignore output.
# Advice on this weirdness from a Fortran user much appreciated!
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
[[ Welcome to GNU libtool Fortran demo!
Real programmers write in FORTRAN.
fsub called
@@ -276,7 +276,7 @@ AT_DATA([expout],
]])
LT_AT_EXEC_CHECK([./fprogram], 0, [ignore])
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
[[Welcome to GNU libtool mixed C/Fortran demo!
The C subroutine returned, claiming that 2*2 = 4
The C subroutine is ok!
diff --git a/tests/mdemo.at b/tests/mdemo.at
index 40f89b4..5fa77f6 100644
--- a/tests/mdemo.at
+++ b/tests/mdemo.at
@@ -592,7 +592,7 @@ main (int argc, char **argv)
}
]])
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
[[Welcome to GNU Hell!
cos (0.0) = 1
** This is not GNU Hello. There is
[SCM] GNU Libtool branch, master, updated. v2.4.2-276-g991b5e5
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 Libtool. The branch, master has been updated via 991b5e52a77c4705614387b370219b3a24e9dc1c (commit) from a61a1114ae1464c39b54e88d1a30735c7daca4b2 (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 991b5e52a77c4705614387b370219b3a24e9dc1c Author: Gary V. Vaughan g...@gnu.org Date: Sat Oct 6 11:47:56 2012 +0700 tests: allow for unstable fortran output ordering. Due to differences in line-endings between C stdout and Fortran stdout, as well as unpredictable output ordering between platforms and runtimes, weaken success criteria to not require the entire output of fortran programs to match a test case. * itests/fcdemo.at, tests/f77demo.at (_LT_CHECK_EXECUTE): Improve comments, and weaken test case to grep for a known line in the f77 runtime output. Signed-off-by: Gary V. Vaughan g...@gnu.org --- Summary of changes: tests/f77demo.at | 33 +++-- tests/fcdemo.at | 21 +++-- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/tests/f77demo.at b/tests/f77demo.at index 5978b3d..a06af37 100644 --- a/tests/f77demo.at +++ b/tests/f77demo.at @@ -245,10 +245,10 @@ LT_AT_AUTOHEADER m4_define([_LT_CHECK_EXECUTE], [LT_AT_MAKE -# Oddly, the output of dynamically linked fprogram differs depending -# on whether it is redirected to a file or sent to stdout, so we -# just check return status, and ignore output. -# Advice on this weirdness from a Fortran user much appreciated! +# Due to differences in line-endings between C stdout and Fortran +# stdout, as well as unpredictable output ordering between platforms +# and runtimes, we can't reliably check the output here... although +# it should be some variation of the following: LT_AT_HOST_DATA([expout], [[ Welcome to GNU libtool Fortran demo! Real programmers write in FORTRAN. @@ -260,8 +260,13 @@ LT_AT_HOST_DATA([expout], fsub3 returned, saying that 4 * 2 = 8 fsub3 is ok! ]]) -LT_AT_EXEC_CHECK([./fprogram], 0, [ignore]) +LT_AT_EXEC_CHECK([./fprogram], 0, [stdout]) +# A weaker output content check that is agnostic to the issues above. +AT_CHECK([grep 'Welcome to GNU libtool Fortran demo!' stdout], + [0], [ignore]) + +# Similarly, we can't reliably compare actual output with the following. LT_AT_HOST_DATA([expout], [[Welcome to GNU libtool mixed C/Fortran demo! The C subroutine returned, claiming that 2*2 = 4 @@ -276,7 +281,11 @@ The C wrapper to the fortran subroutine returned, claiming that 2*2 = 4 The Fortran 77 subroutine is ok! ]]) -LT_AT_EXEC_CHECK([./cprogram], 0, [expout]) +LT_AT_EXEC_CHECK([./cprogram], 0, [stdout]) + +# A weaker output content check that is agnostic to the issues above. +AT_CHECK([grep 'Welcome to GNU libtool mixed C/Fortran demo!' stdout], + [0], [ignore]) ]) @@ -293,18 +302,6 @@ _LT_SETUP LT_AT_CHECK_CONFIG([--disable-shared], [^build_old_libs=yes], [^build_libtool_libs=no]) - -LT_AT_HOST_DATA([expout], -[[ Welcome to GNU libtool Fortran demo! - Real programmers write in FORTRAN. - fsub called - fsubf called - fsub returned, saying that 2 * 2 = 4 - fsub is ok! - fsub3 called - fsub3 returned, saying that 4 * 2 = 8 - fsub3 is ok! -]]) _LT_CHECK_EXECUTE AT_CLEANUP diff --git a/tests/fcdemo.at b/tests/fcdemo.at index 0ade9bb..0ac4431 100644 --- a/tests/fcdemo.at +++ b/tests/fcdemo.at @@ -259,10 +259,10 @@ LT_AT_AUTOHEADER m4_define([_LT_CHECK_EXECUTE], [LT_AT_MAKE -# Oddly, the output of dynamically linked fprogram differs depending -# on whether it is redirected to a file or sent to stdout, so we -# just check return status, and ignore output. -# Advice on this weirdness from a Fortran user much appreciated! +# Due to differences in line-endings between C stdout and Fortran +# stdout, as well as unpredictable output ordering between platforms +# and runtimes, we can't reliably check the output here... although +# it should be some variation of the following: LT_AT_HOST_DATA([expout], [[ Welcome to GNU libtool Fortran demo! Real programmers write in FORTRAN. @@ -274,8 +274,13 @@ LT_AT_HOST_DATA([expout], fsub3 returned, saying that 4 * 2 = 8 fsub3 is ok! ]]) -LT_AT_EXEC_CHECK([./fprogram], 0, [ignore]) +LT_AT_EXEC_CHECK([./fprogram], 0, [stdout]) +# A weaker output content check that is agnostic to the issues above. +AT_CHECK([grep 'Welcome to GNU libtool Fortran demo!' stdout], + [0], [ignore]) + +# Similarly, we can't reliably compare
