8 files changed, 7 insertions, 172 deletions
diff --git a/t/add-missing.tap b/t/add-missing.tap
index c47382b5f..45cc16e4e 100755
--- a/t/add-missing.tap
+++ b/t/add-missing.tap
@@ -153,30 +153,13 @@ check_ ()
   # Test once with '--copy', once without.
   for action in link copy; do
     case $action in
-      link) opts='--add-missing';;
-      copy) opts='-a --copy';;
+      link) opts=;;
+      copy) opts=--copy;;
          *) fatal_ "invalid value '$action' for \$action";;
     esac
     pfx="[$action $name]"
     cp -R generic $action
     cd $action
-    # If the required auxiliary files are missing, and automake is
-    # not told to install them, it should complain and error out,
-    # and also give a useful suggestion.
-    AUTOMAKE_fails -d "$pfx missing files, automake fails"
-    for f in $files; do
-      command_ok_ \
-        "$pfx warn about missing file $f" \
-        $FGREP "required file '$build_aux/$f' not found" stderr
-      # Suggest the user to use '--add-missing'.
-      command_ok_ \
-        "$pfx suggest --add-missing for $f" \
-        grep ".*--add-missing.* install .*'$f'" stderr
-    done
-    # No files should be automatically installed by automake if it
-    # is not told to.
-    if ls "$build_aux" | grep .; then r='not ok'; else r=ok; fi
-    result_ "$r" "$pfx no extra files installed"
     AUTOMAKE_run -d "$pfx automake run successfully" -- $opts
     ls -l . $build_aux
     # The expected files should get installed correctly (e.g., no
diff --git a/t/ar-lib7.sh b/t/ar-lib7.sh
deleted file mode 100755
index c27cabf47..000000000
--- a/t/ar-lib7.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011-2012 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test if automake warns if ar-lib is missing when AM_PROG_AR is used.
-
-. ./defs || exit 1
-
-cat >> configure.ac << 'END'
-AM_PROG_AR
-END
-
-:> Makefile.am
-
-$ACLOCAL
-AUTOMAKE_fails
-
-grep '^configure\.ac:.*ar-lib.*not found' stderr
-
-$AUTOMAKE --add-missing
-
-:
diff --git a/t/dist-auxfile.sh b/t/dist-auxfile.sh
index 763b14ea0..4389f514f 100755
--- a/t/dist-auxfile.sh
+++ b/t/dist-auxfile.sh
@@ -79,8 +79,6 @@ END
   grep "^configure\\.ac:6:.* required file.*$auxdir_rx/zardoz"    stderr
 
   touch $auxdir/foo.txt $auxdir/bar.sh $auxdir/zardoz
-  cp "$am_scriptdir"/missing "$am_scriptdir"/install-sh $auxdir \
-    || fatal_ "fetching auxiliary scripts 'missing' and 'install-sh'"
   $AUTOMAKE
   ./configure
   $MAKE test
diff --git a/t/license2.sh b/t/license2.sh
index 736e96fa0..02d48fd77 100755
--- a/t/license2.sh
+++ b/t/license2.sh
@@ -29,11 +29,10 @@ END
 : >INSTALL
 
 $ACLOCAL
-AUTOMAKE_fails
-grep 'COPYING' stderr
-
-AUTOMAKE_run --add-missing
+AUTOMAKE_run
 grep 'COPYING' stderr
 grep 'GNU General Public License' stderr
 grep 'Consider adding.*version control' stderr
 test -f COPYING
+
+:
diff --git a/t/mdate.sh b/t/mdate.sh
deleted file mode 100755
index e44144a8f..000000000
--- a/t/mdate.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Copyright (C) 1996-2012 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test that mdate-sh is required when Texinfo used and version.texi needed.
-
-. ./defs || exit 1
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-END
-
-cat > textutils.texi << 'END'
-@include version.texi
-@setfilename textutils.info
-END
-
-# Required when using Texinfo.
-: > texinfo.tex
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'required file.*mdate-sh.*not found' stderr
-
-:
diff --git a/t/missing-auxfile-stops-makefiles-creation.sh b/t/missing-auxfile-stops-makefiles-creation.sh
deleted file mode 100755
index d1c0cd41f..000000000
--- a/t/missing-auxfile-stops-makefiles-creation.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011-2012 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Automake should stop the creation of Makefile.in files at the first
-# encountered error due to a required auxiliary file not found.
-
-. ./defs || exit 1
-
-cat >> configure.ac <<END
-AM_PATH_PYTHON
-END
-
-echo SUBDIRS = > Makefile.am
-
-for i in 1 2 3 4 5; do
-  echo "AC_CONFIG_FILES([sub$i/Makefile])" >> configure.ac
-  echo "SUBDIRS += sub$i" >> Makefile.am
-  mkdir sub$i
-  echo python_PYTHON = foo.py > sub$i/Makefile.am
-done
-
-: > sub1/Makefile.am
-
-$ACLOCAL
-
-unset AUTOMAKE_JOBS || :
-
-AUTOMAKE_fails
-ls -l Makefile.in */Makefile.in || : # For debugging.
-# Top-level Makefile.in might be created or not, we don't want to set
-# too strict semantics here, so don't check for it.  But the later
-# files shouldn't exist.
-test -f sub1/Makefile.in
-test ! -e sub2/Makefile.in
-test ! -e sub3/Makefile.in
-test ! -e sub4/Makefile.in
-test ! -e sub5/Makefile.in
-
-rm -f Makefile.in */Makefile.in
-
-: > sub2/Makefile.am
-: > sub3/Makefile.am
-
-AUTOMAKE_fails
-ls -l Makefile.in */Makefile.in || : # For debugging.
-test -f sub1/Makefile.in
-test -f sub2/Makefile.in
-test -f sub3/Makefile.in
-test ! -e sub4/Makefile.in
-test ! -e sub5/Makefile.in
-
-:
diff --git a/t/per-target-flags.sh b/t/per-target-flags.sh
index f8b863692..45beb4bed 100755
--- a/t/per-target-flags.sh
+++ b/t/per-target-flags.sh
@@ -55,14 +55,9 @@ cat - libMakefile.am > libMakefile2.am << 'END'
 AUTOMAKE_OPTIONS = no-dependencies
 END
 
-# Make sure 'compile' is required.
-for m in $makefiles; do
-  AUTOMAKE_fails $m
-  $EGREP " required file.* '(compile|\./compile)'" stderr
-done
-
-: > compile
 $AUTOMAKE
+# Make sure 'compile' is required.
+test -f compile
 
 # Regression test for missing space.
 $FGREP ')-c' $makefiles && exit 1
diff --git a/t/python.sh b/t/python.sh
index a3add40f9..3b73165ad 100755
--- a/t/python.sh
+++ b/t/python.sh
@@ -39,10 +39,6 @@ python_PYTHON = in.py
 END
 
 $ACLOCAL
-
-AUTOMAKE_fails
-grep '^Makefile\.am:1:.* required file.*py-compile' stderr
-
 $AUTOMAKE -a
 grep '^py_compile *=' Makefile.in
 test -f py-compile