[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11b-85-g33ea15d

[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=33ea15dbc7e5c88d50038bb896ca1079674cba8e

The branch, ng/master has been updated
       via  33ea15dbc7e5c88d50038bb896ca1079674cba8e (commit)
       via  944ec778e4bb30fed061b86d7859555c7a29fa6f (commit)
       via  c5a1ec04cbd53df049b125a441a49d69b7dcd0f0 (commit)
      from  8096321f4be6dd3929e11a511a43b8c6da362c67 (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 33ea15dbc7e5c88d50038bb896ca1079674cba8e
Merge: 8096321 944ec77
Author: Stefano Lattarini <address@hidden>
Date:   Sat Apr 14 10:04:51 2012 +0200

    Merge branch 'master' into ng/master
    
    * master:
      parallel-tests: print error messages on stderr, not stdout
      dist tests: fix reduced coverage due to typo

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

Summary of changes:
 lib/am/check.am    |    4 ++--
 t/dist-formats.tap |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/am/check.am b/lib/am/check.am
index 53f91c2..f697144 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -170,9 +170,9 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
          errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
          for i in $$redo_bases; do \
            test -f $$i.trs && test -r $$i.trs \
-             || { echo "$$errmsg $$i.trs"; st=1; }; \
+             || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
            test -f $$i.log && test -r $$i.log \
-             || { echo "$$errmsg $$i.log"; st=1; }; \
+             || { echo "$$errmsg $$i.log" >&2; st=1; }; \
          done; \
          test $$st -eq 0 || exit 1; \
        fi
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
index 4dd6c20..d11971c 100755
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -360,7 +360,7 @@ for fmt in $all_compression_formats; do
     echo "  dist-$fmt" >> am-init.m4
     flip=false
   else
-    echo "AUTOMAKE_OPTIONS += dist-$fmt" >> Makefil.am
+    echo "AUTOMAKE_OPTIONS += dist-$fmt" >> Makefile.am
     flip=:
   fi
 done
@@ -372,7 +372,7 @@ sed 's/AM_INIT_AUTOMAKE.*/m4_include([am-init.m4])/' 
configure.ac > t
 mv -f t configure.ac
 
 # For debugging.
-cat Makefil.am
+cat Makefile.am
 cat configure.ac
 cat am-init.m4
 


hooks/post-receive
-- 
GNU Automake