[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-606-gde6ada3

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

The branch, ng/master has been updated
       via  de6ada3bce58df26febf1c6dcf367ced791dd03c (commit)
       via  e107814e7b8e37bab286735ae316f8f179afdcfa (commit)
       via  3269af789a3b8103996abd28992bb55b1c2fe6fd (commit)
      from  61e23e47ebb7f89ff0933c9dd5a4f61bdde5b636 (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 de6ada3bce58df26febf1c6dcf367ced791dd03c
Author: Stefano Lattarini <address@hidden>
Date:   Mon Jul 23 20:12:17 2012 +0200

    [ng] cosmetics: fix botches spaces in t/memoize.tap
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit e107814e7b8e37bab286735ae316f8f179afdcfa
Author: Stefano Lattarini <address@hidden>
Date:   Mon Jul 23 16:57:00 2012 +0200

    [ng] tests: fix test driver botch-up on Solaris
    
    This issue is very similar to the one fixed by commit v1.12.2-31-g587e0c6.
    
    The test 't/memoize.sh' was producing a '.log' file with few overly-long
    lines (more than 12k characters long) and, when Solaris XPG4 awk was in
    use, that was causing the 'test-driver.sh' script to experience a spurious
    failure:
    
        /usr/xpg4/bin/awk: line 382 (B): Record too long (LIMIT: 19999 bytes)
        tap-driver.sh: fatal: I/O or internal error
    
    * t/memoize.sh: Temporary disable shell tracing and make output in a few
    places, to prevent the resulting '.log' file to contain overly long lines.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 3269af789a3b8103996abd28992bb55b1c2fe6fd
Author: Stefano Lattarini <address@hidden>
Date:   Mon Jul 23 20:09:08 2012 +0200

    [ng] tests: relax even more a grepping check on configure output
    
    This is a follow-up to today's commit v1.12.2-594-geee3aff.
    
    * t/subpkg.sh: Here: don't be too picky about the verb declension
    used in a "checking whether" message.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 t/memoize.tap |   25 +++++++++++++++++++------
 t/subpkg.sh   |    5 +++--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/t/memoize.tap b/t/memoize.tap
index 6d5eda4..587bd87 100755
--- a/t/memoize.tap
+++ b/t/memoize.tap
@@ -88,15 +88,23 @@ END
 var=foo
 for i in 1 2 3 4 5 6 7 8 9 10 11 12; do
   var=$var$var
+  # Temporary disable shell traces, because otherwise the result '.log' file
+  # would end up having too long lines that could confuse inferior awk
+  # implementations (e.g., Solaris 10 /usr/xpg4/bin/awk), which would cause
+  # spurious errors in our test harness.
+  set +x
 done
+set -x # Re-enable shell traces.
 
 T "very long variable name" <<END
 
 $var = \$(call am__memoize,$var,foo)
 
 test:
-       test '\$($var)' = foo
-       test '\$($var)' = foo
+       # Why we silence this?
+       # See comment above about overly long lines in '.log' file.
+       @echo test1; test '\$($var)' = foo
+       @echo test2; test '\$($var)' = foo
 END
 
 #---------------------------------------------------------------------------
@@ -107,15 +115,20 @@ val=bar
 for i in 1 2 3 4 5 6 7 8 9 10 11 12; do
   var=$var$var
   val=$val$val
+  # Temporary disable shell traces.  See comment above for a rationale.
+  set +x
 done
+set -x # Re-enable shell traces.
 
 T "very long variable name with long content" <<END
 
 $var = \$(call am__memoize,$var,$val)
 
 test:
-       test '\$($var)' = '$val'
-       test '\$($var)' = '$val'
+       # Why we silence this?
+       # See comment above about overly long lines in '.log' file.
+       @echo test1; test '\$($var)' = '$val'
+       @echo test2; test '\$($var)' = '$val'
 END
 
 #---------------------------------------------------------------------------
@@ -168,7 +181,7 @@ func = ::$(0)::$(1)::
 test:
        test '$(call func,$(foo))' = ::func::bar::
        test '$(foo)' = bar
-        # Once more.
+       # Once more.
        test '$(call func,$(foo))' = ::func::bar::
 END
 
@@ -182,7 +195,7 @@ indir_func = ::$($1)::
 test:
        test '$(call indir_func,foo)' = ::zardoz::
        test '$(foo)' = zardoz
-        # Once more.
+       # Once more.
        test '$(call indir_func,foo)' = ::zardoz::
 END
 
diff --git a/t/subpkg.sh b/t/subpkg.sh
index 9b9f7eb..d3bbb44 100755
--- a/t/subpkg.sh
+++ b/t/subpkg.sh
@@ -107,8 +107,9 @@ cd ..
 
 ./configure >stdout || { cat stdout; exit 1; }
 cat stdout
-# Don't pretend to know the name or path of the C compiler.
-grep '^checking whether .* understands -c and -o together' stdout
+# Don't pretend to know the name or path of the C compiler.  Also,
+# don't be too picky about the verb declension.
+$EGREP '^checking whether .* understands? -c and -o together' stdout
 
 $MAKE
 $MAKE distcheck


hooks/post-receive
-- 
GNU Automake