From 2baf5a21cdb04088b5ea29a48ae8c04a5664eacf Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Sun, 4 Mar 2001 21:05:09 +0000
Subject: [PATCH] 	* tests/yaccvpath.test: No need to remove dummy files.
 	* tests/subobj3.test: No need to remove dummy files. 	*
 tests/pr9.test: No need to remove dummy files. 	* tests/pr87.test: No
 need to remove dummy files. 	* tests/pr19.test: No need to remove dummy
 files. 	* tests/install2.test: No need to remove dummy files. 	*
 tests/defs: Actually copy in install-sh, mkinstalldirs, missing, 	and
 depcomp.

---
 ChangeLog            | 11 +++++++++++
 tests/defs           | 12 ++++++------
 tests/install2.test  |  3 ---
 tests/pr19.test      |  4 ----
 tests/pr87.test      |  2 --
 tests/pr9.test       |  4 ----
 tests/subobj3.test   |  4 ----
 tests/yaccvpath.test |  4 ----
 8 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 574ef68b..440bdcbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-03-03  Tom Tromey  <tromey@redhat.com>
+
+	* tests/yaccvpath.test: No need to remove dummy files.
+	* tests/subobj3.test: No need to remove dummy files.
+	* tests/pr9.test: No need to remove dummy files.
+	* tests/pr87.test: No need to remove dummy files.
+	* tests/pr19.test: No need to remove dummy files.
+	* tests/install2.test: No need to remove dummy files.
+	* tests/defs: Actually copy in install-sh, mkinstalldirs, missing,
+	and depcomp.
+
 2001-02-27  Pavel Roskin  <proski@gnu.org>
 
 	* tests/yaccvpath.test: Add a delay to make parse.c really out
diff --git a/tests/defs b/tests/defs
index 24a0f750..db0970b8 100644
--- a/tests/defs
+++ b/tests/defs
@@ -22,6 +22,12 @@ esac
 chmod -R a+rwx testSubDir > /dev/null 2>&1
 rm -rf testSubDir > /dev/null 2>&1
 mkdir testSubDir
+
+# Copy in some files we need.
+for file in install-sh mkinstalldirs missing depcomp; do
+   cp $srcdir/../$file testSubDir/$file || exit 1
+done
+
 cd ./testSubDir
 
 # Build appropriate environment in test directory.  Eg create
@@ -37,12 +43,6 @@ AC_PROG_MAKE_SET
 AC_OUTPUT(Makefile)
 END
 
-: > install-sh
-: > mkinstalldirs
-: > missing
-
-(cd .. && cp $srcdir/../depcomp testSubDir/depcomp) || exit 1
-
 # See how redirections should work.  User can set VERBOSE to see all
 # output.
 test -z "$VERBOSE" && {
diff --git a/tests/install2.test b/tests/install2.test
index dd1aa40f..d43cedcd 100755
--- a/tests/install2.test
+++ b/tests/install2.test
@@ -17,9 +17,6 @@ cat > Makefile.am << 'END'
 SUBDIRS = .
 END
 
-# Remove some dummy files added by defs.
-rm -f install-sh mkinstalldirs missing
-
 # Fail gracefully if no autoconf.
 $needs_autoconf
 
diff --git a/tests/pr19.test b/tests/pr19.test
index ca622553..00056e9f 100755
--- a/tests/pr19.test
+++ b/tests/pr19.test
@@ -27,10 +27,6 @@ noinst_PROGRAMS   = foo
 foo_SOURCES       = foo.l
 END
 
-# Remove some files installed by defs.  These will be reinstalled by
-# automake.
-rm -f install-sh missing mkinstalldirs depcomp
-
 echo %% > foo.l
 
 # Fail gracefully if no autoconf.
diff --git a/tests/pr87.test b/tests/pr87.test
index a027606e..c43701bf 100755
--- a/tests/pr87.test
+++ b/tests/pr87.test
@@ -36,8 +36,6 @@ touch README NEWS AUTHORS ChangeLog
 
 mkdir build
 
-rm missing install-sh mkinstalldirs
-
 # We use gcc and not gcc -traditional as the latter fails on some
 # Linux boxes (Red Hat 5.1 in particular).
 $ACLOCAL \
diff --git a/tests/pr9.test b/tests/pr9.test
index 952588a0..c0e9e53d 100755
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -13,10 +13,6 @@ END
 
 : > Makefile.am
 
-# Remove some files installed by defs.  These will be reinstalled by
-# automake.
-rm -f install-sh missing mkinstalldirs depcomp
-
 mkdir support
 
 # Fail gracefully if no autoconf.
diff --git a/tests/subobj3.test b/tests/subobj3.test
index bdd403e0..bb3b373e 100755
--- a/tests/subobj3.test
+++ b/tests/subobj3.test
@@ -21,10 +21,6 @@ bin_PROGRAMS = hello
 hello_SOURCES = sub/hello.c
 END
 
-# Remove some files installed by defs.  These will be reinstalled by
-# automake.
-rm -f install-sh missing mkinstalldirs depcomp
-
 mkdir sub
 cat > sub/hello.c << 'END'
 #include <stdio.h>
diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test
index 9d90f202..d78ca4ed 100755
--- a/tests/yaccvpath.test
+++ b/tests/yaccvpath.test
@@ -48,10 +48,6 @@ END
 YACC="bison -y"
 export YACC
 
-# Remove some files installed by defs.
-# They will be reinstalled by automake.
-rm -f install-sh missing mkinstalldirs
-
 set -e
 
 $ACLOCAL
-- 
2.43.5