[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-836-gdac36d3

[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=dac36d3ce5a0909477fe9c5efeb0199c6631ab1d

The branch, testsuite-work has been updated
       via  dac36d3ce5a0909477fe9c5efeb0199c6631ab1d (commit)
       via  90d328715bac43d0e0568d137602d7dab36c29d1 (commit)
      from  5d51a65dcc7087ba2f5db5da3c16efbff3182cdc (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 dac36d3ce5a0909477fe9c5efeb0199c6631ab1d
Merge: 5d51a65 90d3287
Author: Stefano Lattarini <address@hidden>
Date:   Sat May 7 11:50:02 2011 +0200

    Merge branch 'fix-depmod-tests-generation' into testsuite-work

commit 90d328715bac43d0e0568d137602d7dab36c29d1
Author: Stefano Lattarini <address@hidden>
Date:   Sat May 7 11:49:40 2011 +0200

    depmod tests: fix bug in depmodes list extraction
    
    * tests/depmod-tests.sh (get_depmodes): Use `echo $all_depmodes'
    instead of `... | tr "$nl" "$sp"' to strip extra whitespaces and
    newlines from `$all_depmodes'.  The latter idiom with `tr' is
    wrong since it gets run before `./defs' is sourced, and thus `$nl'
    and `$sp' are undefined.
    Bug revealad by FreeBSD tr(1) implementation, which doesn't accept
    empty strings as arguments.

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

Summary of changes:
 ChangeLog             |   11 +++++++++++
 tests/depmod-tests.sh |    4 +++-
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf2fc14..dc70bf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-05-07  Stefano Lattarini  <address@hidden>
+
+       depmod tests: fix bug in depmodes list extraction
+       * tests/depmod-tests.sh (get_depmodes): Use `echo $all_depmodes'
+       instead of `... | tr "$nl" "$sp"' to strip extra whitespaces and
+       newlines from `$all_depmodes'.  The latter idiom with `tr' is
+       wrong since it gets run before `./defs' is sourced, and thus `$nl'
+       and `$sp' are undefined.
+       Bug revealad by FreeBSD tr(1) implementation, which doesn't accept
+       empty strings as arguments.
+
 2011-05-04  Stefano Lattarini  <address@hidden>
 
        tests: add excerpts from few original bug reports, for clarity.
diff --git a/tests/depmod-tests.sh b/tests/depmod-tests.sh
index 4eb8419..2be8af0 100755
--- a/tests/depmod-tests.sh
+++ b/tests/depmod-tests.sh
@@ -141,7 +141,9 @@ get_depmodes ()
 {
   # Keep this in sync with the contents of depend.m4.
   all_depmodes=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < "$1" \
-    | grep -v '^none$' | tr "$nl" "$sp"` \
+                  | grep -v '^none$'` \
+    && : Turn newlines and tabs into spaces, and strip extra whitespace. \
+    && all_depmodes=`echo $all_depmodes` \
     && test -n "$all_depmodes" || {
       echo "$2: failed to extract list of valid depmodes from '$1'" >&2
       exit 99


hooks/post-receive
-- 
GNU Automake