[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1977-gc11924b

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

The branch, master has been updated
       via  c11924b585cd5f626034cfbcb728d43df7e070a5 (commit)
      from  229f7712d48ef7b5f7324dbe66695b88c4f637b8 (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 c11924b585cd5f626034cfbcb728d43df7e070a5
Author: Stefano Lattarini <address@hidden>
Date:   Fri Feb 17 23:50:30 2012 +0100

    tests: avoid spurious failure with FreeBSD make
    
    * tests/parallel-tests-extra-programs.test: FreeBSD make seems to
    write (some) diagnostic messages on stdout instead than on stderr,
    so now we also grep the stdout for the expected make diagnostic.

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

Summary of changes:
 tests/parallel-tests-extra-programs.test |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/parallel-tests-extra-programs.test 
b/tests/parallel-tests-extra-programs.test
index 4a18443..3802176 100755
--- a/tests/parallel-tests-extra-programs.test
+++ b/tests/parallel-tests-extra-programs.test
@@ -137,8 +137,10 @@ grep '^PASS: baz\.test$' stdout
 # $(EXEEXT).
 grep '^PASS: foo\.bin' stdout
 grep '^PASS: bar\.bin' stdout
-# Expected error messages from make.
-$EGREP 'none\.(bin|o|c)' stderr
+# Expected error messages from make.  Some make implementations (e.g.,
+# FreeBSD make) seem to print the error on stdout instead, so check for
+# it there as well.
+$EGREP 'none\.(bin|o|c)' stderr stdout
 
 # What we check now:
 #  1. if we make the last EXTRA_PROGRAM buildable, the failed tests


hooks/post-receive
-- 
GNU Automake