* 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 6a8f273428ebbc80702748e22a4c538a7ee8d648..ec0e7bc9cfe12213c7b0de8fce7998fd58e4b581 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * 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 d26301e1e456c834b358423f90c06c7d87688f62..093790d310eb102708f0cdad842bb6ab79c0acf5 100755 (executable)
--- 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 f14d83d00cb53c336b41d6376d53b78cf113a9cd..ac4ec3668771274d91d99601413473029e7d12f5 100755 (executable)
--- 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 7c98606561da34d63e23c6c550a4f0654e8eb87c..af6ad53a9cdbda101df79852020995cee2bdf169 100755 (executable)
--- 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 eb5c0a4a4e0800ca00988f80254fdab2ec2c9c17..bcd71e773af78f5c8374b84a6db5d8de2de0cb84 100755 (executable)
--- 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 ed4ba93787fb3331228d4c3d5c980f410d076099..6cc8212edb83a43505c5b2c565fbb6174b36da18 100755 (executable)
--- 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 5dc241c794a970c5789d272f582d161340cdc710..dcd29715da89dcb73d1e1327eb3c1da29faadf91 100755 (executable)
--- 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