Merge branch 'maint'

[platform/upstream/automake.git] / t / aclocal-acdir.sh

diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
index abd7857..ac5de4c 100755 (executable)
--- a/t/aclocal-acdir.sh
+++ b/t/aclocal-acdir.sh
@@ -14,9 +14,9 @@
 # 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 aclocal's '--acdir', '--automake-acdir' and '--system-acdir'
-# options.  Also check that stuff in the automake acdir takes precedence
-# over stuff in the system acdir.
+# Test aclocal's '--automake-acdir' and '--system-acdir' options.  Also
+# check that stuff in the automake acdir takes precedence over stuff in
+# the system acdir.
 
 . ./defs || exit 1
 
@@ -72,24 +72,4 @@ $FGREP 'fake--init--automake' configure
 $FGREP 'am--macro' configure
 $FGREP 'my--macro' configure && exit 1 # Just to be sure.
 
-rm -rf autom4te*.cache
-
-# Obsolescent '--acdir' option.
-$ACLOCAL -Wobsolete --acdir am 2>stderr && { cat stderr >&2; exit 1; }
-cat stderr >&2
-grep '.*--acdir.*deprecated' stderr
-
-rm -rf autom4te*.cache
-
-$ACLOCAL -Wno-obsolete --acdir am
-$AUTOCONF --force
-$FGREP 'fake--init--automake' configure
-$FGREP 'am--macro' configure
-
-rm -rf autom4te*.cache
-
-$ACLOCAL -Wno-obsolete --acdir sys 2>stderr && { cat stderr >&2; exit 1; }
-cat stderr >&2
-grep 'macro .*AM_INIT_AUTOMAKE.* not found' stderr
-
 :