From: Ralf Wildenhues Date: Sun, 23 May 2010 12:34:29 +0000 (+0200) Subject: Relax silent8.test for NetBSD make. X-Git-Tag: v1.11b~589 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c96a2cd2144a44cfb326ff56fb8822f5be198a5;p=platform%2Fupstream%2Fautomake.git Relax silent8.test for NetBSD make. * tests/silent8.test: Accept ./foo.info in output as well. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 7601ea5..8fc9b2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-05-23 Ralf Wildenhues + Relax silent8.test for NetBSD make. + * tests/silent8.test: Accept ./foo.info in output as well. + Fix unportable sed script in maintainer-check test. * Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to not contain semicolon after 'b' or brace commands, for NetBSD. diff --git a/tests/silent8.test b/tests/silent8.test index 2546775..6833840 100755 --- a/tests/silent8.test +++ b/tests/silent8.test @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -50,7 +50,8 @@ $MAKE V=0 dvi html info ps pdf >stdout || { cat stdout; Exit 1; } cat stdout grep 'DVIPS foo.ps' stdout || Exit 1 grep 'MAKEINFO foo.html' stdout || Exit 1 -grep 'MAKEINFO foo.info' stdout || Exit 1 +# NetBSD make will print `./foo.info' instead of `foo.info'. +grep 'MAKEINFO.*foo.info' stdout || Exit 1 grep 'TEXI2DVI foo.dvi' stdout || Exit 1 grep 'TEXI2PDF foo.pdf' stdout || Exit 1 @@ -59,7 +60,7 @@ $MAKE clean || Exit 1 $MAKE V=1 dvi html info ps pdf >stdout || { cat stdout; Exit 1; } grep 'DVIPS foo.ps' stdout && Exit 1 grep 'MAKEINFO foo.html' stdout && Exit 1 -grep 'MAKEINFO foo.info' stdout && Exit 1 +grep 'MAKEINFO.*foo.info' stdout && Exit 1 grep 'TEXI2DVI foo.dvi' stdout && Exit 1 grep 'TEXI2PDF foo.pdf' stdout && Exit 1