automake-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Automake-commit] [SCM] GNU Automake branch, micro, updated. v1.13.2-61-


From: Peter Rosin
Subject: [Automake-commit] [SCM] GNU Automake branch, micro, updated. v1.13.2-61-g625678d
Date: Wed, 29 May 2013 14:56:50 +0000

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=625678d54b616bf5c2db6c803f4b0746f70e3e53

The branch, micro has been updated
       via  625678d54b616bf5c2db6c803f4b0746f70e3e53 (commit)
      from  eefd01b3fb3f233bcaffdd0aedc611dd819634aa (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 625678d54b616bf5c2db6c803f4b0746f70e3e53
Author: Peter Rosin <address@hidden>
Date:   Wed May 29 16:53:55 2013 +0200

    tests: avoid a spurious failure on MSYS
    
    Fixes automake bug#14493.
    
    * t/cxx-demo.sh: Strip CR characters from the program output.
    
    Signed-off-by: Peter Rosin <address@hidden>

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

Summary of changes:
 t/cxx-demo.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/t/cxx-demo.sh b/t/cxx-demo.sh
index f6d568d..f872c43 100644
--- a/t/cxx-demo.sh
+++ b/t/cxx-demo.sh
@@ -165,7 +165,8 @@ END
     Good morning, work.
 END
   for p in play work; do
-    ./$p > got.$p || { cat got.$p; exit 1; }
+    # Strip CR characters catering to MinGW programs on MSYS.
+    ./$p | tr -d '\015' > got.$p || { cat got.$p; exit 1; }
     cat exp.$p
     cat got.$p
     diff exp.$p got.$p


hooks/post-receive
-- 
GNU Automake



reply via email to

[Prev in Thread] Current Thread [Next in Thread]