From: Ralf Wildenhues Date: Tue, 6 Jun 2006 20:42:37 +0000 (+0000) Subject: * tests/pr401.test: Replace "perl -i" with sed and mv, for X-Git-Tag: Release-1-9b~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6906c9ba73d949fbc051260555d0c07738360087;p=thirdparty%2Fautomake.git * tests/pr401.test: Replace "perl -i" with sed and mv, for MinGW perl. * tests/pr401b.test, tests/pr401c.test, tests/python11.test, * tests/yacc6.test, tests/yacc8.test: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 6a8f27342..ec0e7bc9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-06-06 Ralf Wildenhues + * tests/pr401.test: Replace "perl -i" with sed and mv, for + MinGW perl. + * tests/pr401b.test, tests/pr401c.test, tests/python11.test, + * tests/yacc6.test, tests/yacc8.test: Likewise. + * m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Do not use plain `grep' on the Makefile, as its line length may exceed that for grep. Bug report against coreutils by Sam Sirlin. diff --git a/tests/pr401.test b/tests/pr401.test index d26301e1e..093790d31 100755 --- a/tests/pr401.test +++ b/tests/pr401.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -93,8 +93,8 @@ $MAKE distcheck ## Test using LIBOBJS from a sibling directory. ## ## -------------------------------------------- ## -$PERL -pi -e 's/#: //' configure.in -$PERL -pi -e 's/lib\/Makefile //' configure.in +sed 's/#: //; s/lib\/Makefile //' configure.in >configure.int +mv -f configure.int configure.in cat >Makefile.am <<'EOF' SUBDIRS = src @@ -126,7 +126,8 @@ $MAKE distclean ## Test using LIBOBJS from parent directory. ## ## ----------------------------------------- ## -$PERL -pi -e 's/^.*src\/Makefile.*$//' configure.in +sed 's/^.*src\/Makefile.*$//' configure.in >configure.int +mv -f configure.int configure.in cat >Makefile.am <<'EOF' AUTOMAKE_OPTIONS = subdir-objects diff --git a/tests/pr401b.test b/tests/pr401b.test index f14d83d00..ac4ec3668 100755 --- a/tests/pr401b.test +++ b/tests/pr401b.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -94,8 +94,8 @@ $MAKE distcheck ## Test using LTLIBOBJS from a sibling directory. ## ## ---------------------------------------------- ## -$PERL -pi -e 's/#: //' configure.in -$PERL -pi -e 's/lib\/Makefile //' configure.in +sed 's/#: //; s/lib\/Makefile //' configure.in >configure.int +mv -f configure.int configure.in cat >Makefile.am <<'EOF' SUBDIRS = src @@ -127,7 +127,8 @@ $MAKE distclean ## Test using LTLIBOBJS from parent directory. ## ## ------------------------------------------- ## -$PERL -pi -e 's/^.*src\/Makefile.*$//' configure.in +sed 's/^.*src\/Makefile.*$//' configure.in >configure.int +mv -f configure.int configure.in cat >Makefile.am <<'EOF' AUTOMAKE_OPTIONS = subdir-objects diff --git a/tests/pr401c.test b/tests/pr401c.test index 7c9860656..af6ad53a9 100755 --- a/tests/pr401c.test +++ b/tests/pr401c.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -95,8 +95,8 @@ $MAKE distcheck ## Test using ALLOCA from a sibling directory. ## ## ------------------------------------------- ## -$PERL -pi -e 's/#: //' configure.in -$PERL -pi -e 's/lib\/Makefile //' configure.in +sed 's/#: //; s/lib\/Makefile //' configure.in >configure.int +mv -f configure.int configure.in cat >Makefile.am <<'EOF' SUBDIRS = src @@ -128,7 +128,8 @@ $MAKE distclean ## Test using ALLOCA from parent directory. ## ## ---------------------------------------- ## -$PERL -pi -e 's/^.*src\/Makefile.*$//' configure.in +sed 's/^.*src\/Makefile.*$//' configure.in >configure.int +mv -f configure.int configure.in cat >Makefile.am <<'EOF' AUTOMAKE_OPTIONS = subdir-objects diff --git a/tests/python11.test b/tests/python11.test index eb5c0a4a4..bcd71e773 100755 --- a/tests/python11.test +++ b/tests/python11.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -46,7 +46,8 @@ grep 'checking for IShouldNotExist1' stdout grep 'checking for IShouldNotExist2' stdout grep 'no suitable Python interpreter found' stderr -$PERL -pi -e 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.in +sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.in >configure.int +mv -f configure.int configure.in $ACLOCAL $AUTOCONF # This one should define PYTHON as : and exit succesfully diff --git a/tests/yacc6.test b/tests/yacc6.test index ed4ba9378..6cc8212ed 100755 --- a/tests/yacc6.test +++ b/tests/yacc6.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -104,6 +104,7 @@ touch sub/bar.y $MAKE $MAKE test-time-unchanged $sleep -$PERL -pi -e s/TOKEN/TEKON/g sub/bar.y +sed s/TOKEN/TEKON/g sub/bar.y >sub/bar.yt +mv -f sub/bar.yt sub/bar.y $MAKE $MAKE test-time-changed diff --git a/tests/yacc8.test b/tests/yacc8.test index 5dc241c79..dcd29715d 100755 --- a/tests/yacc8.test +++ b/tests/yacc8.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -90,7 +90,8 @@ touch ../foo/parse.y $MAKE obj test `ls -1t foo/parse.h z | sed 1q` = z $sleep -$PERL -pi -e 's/%%/%token TOKEN\n%%/g' ../foo/parse.y +sed 's/%%/%token TOKEN\n%%/g' ../foo/parse.y >../foo/parse.yt +mv -f ../foo/parse.yt ../foo/parse.y $MAKE obj test `ls -1t foo/parse.h z | sed 1q` = foo/parse.h