tests: expose automake bug#14560

[platform/upstream/automake.git] / t / acloca10.sh

diff --git a/t/acloca10.sh b/t/acloca10.sh
old mode 100755 (executable)
new mode 100644 (file)
index 05db9b9..632e816
--- a/t/acloca10.sh
+++ b/t/acloca10.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 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
@@ -15,8 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Make sure aclocal define macros in the same order as -I's.
-# This is the same as aclocal9.test, with the macro calls reversed.
-# (It did make a difference.)
+# This is the same as aclocal-I-order-1.sh, with the macro calls
+# reversed (it did make a difference).
 #
 # Also check for --install.
 
@@ -24,7 +24,7 @@
 # TODO: puts third-party macros directly into 'acdir'.
 
 am_create_testdir=empty
-. ./defs || Exit 1
+. test-init.sh
 
 cat > configure.ac << 'END'
 AC_INIT
@@ -57,8 +57,8 @@ $FGREP ':macro11:' configure
 $FGREP ':macro21:' configure
 $FGREP ':macro33:' configure
 grep MACRO3 aclocal.m4
-test ! -f m4_1/macro.m4
-test ! -f m4_2/macro.m4
+test ! -e m4_1/macro.m4
+test ! -e m4_2/macro.m4
 
 $sleep
 
@@ -68,8 +68,8 @@ $FGREP ':macro12:' configure
 $FGREP ':macro21:' configure
 $FGREP ':macro33:' configure
 grep MACRO3 aclocal.m4
-test ! -f m4_1/macro.m4
-test ! -f m4_2/macro.m4
+test ! -e m4_1/macro.m4
+test ! -e m4_2/macro.m4
 
 $sleep
 
@@ -78,9 +78,9 @@ $AUTOCONF
 $FGREP ':macro11:' configure
 $FGREP ':macro21:' configure
 $FGREP ':macro33:' configure
-grep MACRO3 aclocal.m4 && Exit 1
+grep MACRO3 aclocal.m4 && exit 1
 test -f m4_1/macro.m4
-test ! -f m4_2/macro.m4
+test ! -e m4_2/macro.m4
 cp aclocal.m4 copy.m4
 
 $sleep
@@ -91,10 +91,10 @@ $AUTOCONF
 $FGREP ':macro11:' configure
 $FGREP ':macro21:' configure
 $FGREP ':macro33:' configure
-grep MACRO3 aclocal.m4 && Exit 1
-grep GREPME m4_1/macro.m4 && Exit 1
+grep MACRO3 aclocal.m4 && exit 1
+grep GREPME m4_1/macro.m4 && exit 1
 test -f m4_1/macro.m4
-test ! -f m4_2/macro.m4
+test ! -e m4_2/macro.m4
 diff aclocal.m4 copy.m4
 
 :