Merge branch 'maint'

[platform/upstream/automake.git] / t / add-missing.tap

diff --git a/t/add-missing.tap b/t/add-missing.tap
index 6f16a0a..f15657a 100755 (executable)
--- a/t/add-missing.tap
+++ b/t/add-missing.tap
@@ -20,7 +20,7 @@
 # default, but copied if the '--copy' option is used.
 
 am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
 
 plan_ "later"
 
@@ -99,11 +99,9 @@ check_ ()
   # shared by its "subtests").
   mkdir generic
   cd generic
-  # Use 'echo > ...', not ': > ...', here and below, as Solaris 10 /bin/sh
-  # might not execute the latter (the Autoconf manual gives more details).
-  echo > Makefile.am
+  : > Makefile.am
   if test $override = yes; then
-    echo > configure.ac
+    : > configure.ac
   else
     cp "$ocwd"/configure.stub configure.ac
   fi
@@ -169,11 +167,11 @@ check_ ()
     for f in $files; do
       command_ok_ \
         "$pfx warn about missing file $f" \
-        grep "required file ['\`]$build_aux/$f' not found" stderr
+        $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
+        grep ".*--add-missing.* install .*'$f'" stderr
     done
     # No files should be automatically installed by automake if it
     # is not told to.
@@ -192,7 +190,7 @@ check_ ()
     for f in $files; do
       command_ok_ \
         "$pfx report installation of $f" \
-        grep ": installing ['\`]$build_aux/$f'$" stderr
+        $FGREP ": installing '$build_aux/$f'" stderr
     done
     # Only the expected files should be installed.  But automake always
     # require 'missing' and 'install-sh', so account for them.
@@ -345,17 +343,6 @@ rm -f foo.texi
 
 check_ <<'END'
 == Name ==
-elisp-comp
-== Files ==
-elisp-comp
-== configure.ac ==
-AM_PATH_LISPDIR
-== Makefile.am ==
-lisp_LISP = foo.el
-END
-
-check_ <<'END'
-== Name ==
 py-compile
 == Files ==
 py-compile