From 747c60634e269ecf740254d86f4a4a2500c20524 Mon Sep 17 00:00:00 2001
From: "Gary V. Vaughan" <gary@gnu.org>
Date: Wed, 30 Oct 2013 17:39:06 +1300
Subject: tests: use $GREP throughout.

Trust the user, and use $GREP from TESTS_EVVIRONMENT uniformly.
* Makefile.am (TESTS_ENVIRONMENT): Add GREP setting.
* tests/am-subdir.at, tests/archive-in-archive.at, tests/bindir.at,
tests/configure-iface.at, tests/cwrapper.at, tests/darwin.at,
tests/demo.at, tests/destdir.at, tests/dumpbin-symbols.at,
tests/early-libtool.at, tests/execute-mode.at, tests/export-def.at,
tests/export.at, tests/f77demo.at, tests/fcdemo.at, tests/flags.at,
tests/help.at, tests/inherited_flags.at, tests/install.at,
tests/lalib-syntax.at, tests/libtool.at, tests/libtoolize.at,
tests/localization.at, tests/lt_dladvise.at, tests/lt_dlopen.at,
tests/lt_dlopenext.at, tests/ltdl-api.at, tests/ltdl-libdir.at,
tests/mdemo.at, tests/old-m4-iface.at, tests/pic_flag.at,
tests/resident.at, tests/runpath-in-lalib.at, tests/search-path.at,
tests/static.at, tests/sysroot.at, tests/template.at,
tests/testsuite.at, tests/versioning.at: Replace all hardcoded grep
invocations with $GREP.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---
 tests/am-subdir.at          |  4 ++--
 tests/archive-in-archive.at |  6 +++---
 tests/bindir.at             |  4 ++--
 tests/configure-iface.at    |  2 +-
 tests/cwrapper.at           | 14 +++++++-------
 tests/darwin.at             | 12 ++++++------
 tests/demo.at               |  6 +++---
 tests/destdir.at            |  2 +-
 tests/dumpbin-symbols.at    |  4 ++--
 tests/early-libtool.at      |  8 ++++----
 tests/execute-mode.at       |  6 +++---
 tests/export-def.at         |  2 +-
 tests/export.at             |  2 +-
 tests/f77demo.at            |  4 ++--
 tests/fcdemo.at             |  4 ++--
 tests/flags.at              |  2 +-
 tests/help.at               | 22 +++++++++++-----------
 tests/inherited_flags.at    | 18 +++++++++---------
 tests/install.at            |  8 ++++----
 tests/lalib-syntax.at       |  2 +-
 tests/libtool.at            | 28 ++++++++++++++--------------
 tests/libtoolize.at         |  2 +-
 tests/localization.at       |  4 ++--
 tests/lt_dladvise.at        |  2 +-
 tests/lt_dlopen.at          |  4 ++--
 tests/lt_dlopenext.at       |  6 +++---
 tests/ltdl-api.at           |  4 ++--
 tests/ltdl-libdir.at        |  2 +-
 tests/mdemo.at              | 12 ++++++------
 tests/old-m4-iface.at       |  8 ++++----
 tests/pic_flag.at           |  8 ++++----
 tests/resident.at           |  2 +-
 tests/runpath-in-lalib.at   |  4 ++--
 tests/search-path.at        |  4 ++--
 tests/static.at             |  4 ++--
 tests/sysroot.at            | 10 +++++-----
 tests/template.at           |  2 +-
 tests/testsuite.at          |  6 +++---
 tests/versioning.at         |  4 ++--
 39 files changed, 124 insertions(+), 124 deletions(-)

(limited to 'tests')

diff --git a/tests/am-subdir.at b/tests/am-subdir.at
index 59454266..cafcdc4f 100644
--- a/tests/am-subdir.at
+++ b/tests/am-subdir.at
@@ -78,9 +78,9 @@ void sub (void) { printf ("** This is libsub **\n"); }
 LT_AT_BOOTSTRAP([--copy], [-I m4], [ignore], [--add-missing])
 
 LT_AT_EXEC_CHECK([subdir/subdemo], 0, stdout)
-AT_CHECK([grep 'Welcome to GNU Libtool subdir-objects test' stdout],
+AT_CHECK([$GREP 'Welcome to GNU Libtool subdir-objects test' stdout],
 	 [], [ignore])
-AT_CHECK([grep 'This is libsub' stdout],
+AT_CHECK([$GREP 'This is libsub' stdout],
 	 [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/archive-in-archive.at b/tests/archive-in-archive.at
index 3522c26f..8ee1ced7 100644
--- a/tests/archive-in-archive.at
+++ b/tests/archive-in-archive.at
@@ -53,7 +53,7 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAG
 AT_CHECK([$LIBTOOL --mode=install cp libbar.la $thisdir], [], [ignore], [ignore])
 eval `$EGREP '^(old_library)=' < libbar.la`
 libbar=$old_library
-AT_CHECK([$AR -t $libbar | grep $libfoo],[1],[ignore],[ignore])
-AT_CHECK([$AR -t $libbar | grep foo.$OBJEXT],[],[ignore],[ignore])
-AT_CHECK([$AR -t $libbar | grep bar.$OBJEXT],[],[ignore],[ignore])
+AT_CHECK([$AR -t $libbar | $GREP $libfoo],[1],[ignore],[ignore])
+AT_CHECK([$AR -t $libbar | $GREP foo.$OBJEXT],[],[ignore],[ignore])
+AT_CHECK([$AR -t $libbar | $GREP bar.$OBJEXT],[],[ignore],[ignore])
 AT_CLEANUP
diff --git a/tests/bindir.at b/tests/bindir.at
index cc9c24a2..ab51569f 100644
--- a/tests/bindir.at
+++ b/tests/bindir.at
@@ -122,7 +122,7 @@ return 0;
 
 
 curdir=`pwd`
-eval "`$LIBTOOL --config | grep '^objdir='`"
+eval "`$LIBTOOL --config | $GREP '^objdir='`"
 
 AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC -c -o foo.lo $CPPFLAGS $CFLAGS foo.c],[0],[ignore],[ignore])
 AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC -c -o baz.lo $CPPFLAGS $CFLAGS baz.c],[0],[ignore],[ignore])
@@ -181,7 +181,7 @@ case $host_os in
     ;;
 esac
 
-eval "`$LIBTOOL --config | grep '^build_libtool_libs='`"
+eval "`$LIBTOOL --config | $GREP '^build_libtool_libs='`"
 AT_CHECK([test yes = "$build_libtool_libs" || exit 77])
 
 ####
diff --git a/tests/configure-iface.at b/tests/configure-iface.at
index 90af64d0..d2fca48c 100644
--- a/tests/configure-iface.at
+++ b/tests/configure-iface.at
@@ -320,7 +320,7 @@ print-ltdl:
 
 LT_AT_BOOTSTRAP([--ltdl], [-I libltdl/m4], [ignore], [ignore], [], [], [ignore])
 AT_CHECK([$MAKE print-ltdl], [], [stdout], [ignore])
-AT_CHECK([grep libltdl/libltdlc.la stdout], [], [ignore])
+AT_CHECK([$GREP libltdl/libltdlc.la stdout], [], [ignore])
 
 AT_CLEANUP
 
diff --git a/tests/cwrapper.at b/tests/cwrapper.at
index 03b0e8c1..2ada9575 100644
--- a/tests/cwrapper.at
+++ b/tests/cwrapper.at
@@ -26,7 +26,7 @@ AT_SETUP([cwrapper for uninstalled executables])
 AT_KEYWORDS([libtool])
 
 # make sure existing libtool is configured for shared libraries
-AT_CHECK([$LIBTOOL --features | grep 'disable shared libraries' && exit 77],
+AT_CHECK([$LIBTOOL --features | $GREP 'disable shared libraries' && exit 77],
 	 [1], [ignore])
 
 AT_DATA([trivial.c],
@@ -98,7 +98,7 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o usea$EXEEXT usea.$OBJEXT
          [], [ignore], [ignore])
 LT_AT_EXEC_CHECK([./usea], [0], [ignore], [stderr], [--lt-debug])
 LT_AT_UNIFY_NL([stderr])
-AT_CHECK([grep 'libtool wrapper' stderr], [0], [ignore], [ignore])
+AT_CHECK([$GREP 'libtool wrapper' stderr], [0], [ignore], [ignore])
 
 
 # Test compile-time activation of wrapper debugging.
@@ -128,7 +128,7 @@ for debugwrapper_flags in '-DLT_DEBUGWRAPPER'; do
            [], [ignore], [ignore])
   LT_AT_EXEC_CHECK([./usea], [0], [ignore], [stderr], [])
   LT_AT_UNIFY_NL([stderr])
-  AT_CHECK([grep 'libtool wrapper' stderr], [0], [ignore], [ignore])
+  AT_CHECK([$GREP 'libtool wrapper' stderr], [0], [ignore], [ignore])
 done
 
 
@@ -177,7 +177,7 @@ for dirpath in $PATH; do
 done
 IFS=$save_IFS
 
-until $ECHO "PATH=$PATH" | grep 'PATH=.\{250\}'; do
+until $ECHO "PATH=$PATH" | $GREP 'PATH=.\{250\}'; do
   PATH=$PATH$PATH_SEPARATOR$dirpath
 done
 export PATH
@@ -190,9 +190,9 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -no-fast-install ]dnl
 AT_CHECK([test -f "$objdir/lt-usea.c" || exit 77])
 
 # Try to make sure the test is relevant.
-AT_CHECK([grep ' *fputs' $objdir/lt-usea.c > /dev/null])
+AT_CHECK([$GREP ' *fputs' $objdir/lt-usea.c > /dev/null])
 # Check for no overly long fputs.
-AT_CHECK([grep ' *fputs.\{250\}' $objdir/lt-usea.c], [1])
+AT_CHECK([$GREP ' *fputs.\{250\}' $objdir/lt-usea.c], [1])
 
 
 AT_CLEANUP
@@ -202,7 +202,7 @@ AT_SETUP([cwrapper and installed shared libraries])
 AT_KEYWORDS([libtool])
 
 # make sure existing libtool is configured for shared libraries
-AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
+AT_CHECK([$LIBTOOL --features | $GREP 'enable shared libraries' || exit 77],
 	 [], [ignore])
 
 LDFLAGS="$LDFLAGS -no-undefined"
diff --git a/tests/darwin.at b/tests/darwin.at
index 0d6e9139..edf528dd 100644
--- a/tests/darwin.at
+++ b/tests/darwin.at
@@ -145,7 +145,7 @@ echo stamp > $lockfile
 AT_CHECK([$LIBTOOL --dry-run --mode=link $CC $CFLAGS $LDFLAGS ]dnl
 	 [ -o libbar.la bar.lo -rpath /foo libfoo.la],
 	 [], [ignore], [ignore])
-AT_CHECK([grep stamp $lockfile], [], [ignore])
+AT_CHECK([$GREP stamp $lockfile], [], [ignore])
 
 AT_CLEANUP
 
@@ -187,7 +187,7 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS ]dnl
 AT_CHECK([echo quit | $LIBTOOL --mode=execute gdb main],
 	 [ignore], [ignore], [stderr])
 
-AT_CHECK([grep 'Could not find object file' stderr],[1],[ignore],[ignore])
+AT_CHECK([$GREP 'Could not find object file' stderr],[1],[ignore],[ignore])
 
 AT_XFAIL_IF([
 eval "`$LIBTOOL --config | $EGREP '^(whole_archive_flag_spec)='`"
@@ -201,7 +201,7 @@ rm -rf .libs/*.dSYM
 
 AT_CHECK([echo quit | $LIBTOOL --mode=execute gdb main],
 	 [ignore], [ignore], [stderr])
-AT_CHECK([grep 'Could not find object file' stderr],[1],[ignore],[ignore])
+AT_CHECK([$GREP 'Could not find object file' stderr],[1],[ignore],[ignore])
 
 AT_CLEANUP
 
@@ -234,7 +234,7 @@ AT_SETUP([darwin can lt_dlopen .dylib and .so files])
 AT_KEYWORDS([libltdl dylib])
 
 # This test requires shared library support.
-AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
+AT_CHECK([$LIBTOOL --features | $GREP 'enable shared libraries' || exit 77],
 	 [], [ignore])
 
 eval `$LIBTOOL --config | $EGREP '^shrext_cmds='`
@@ -437,10 +437,10 @@ rm $libdir/libsimple-dylib.la
 for dir in inst/lib "$libdir"; do
   LT_AT_EXEC_CHECK([./ltdl-loader], [], [stdout], [ignore],
 	    [$dir/simple-module World])
-  AT_CHECK([grep "Hello, World" stdout], [], [ignore])
+  AT_CHECK([$GREP "Hello, World" stdout], [], [ignore])
   LT_AT_EXEC_CHECK([./ltdl-loader], [], [stdout], [ignore],
 	    [$dir/libsimple-dylib World])
-  AT_CHECK([grep "Hello, World" stdout], [], [ignore])
+  AT_CHECK([$GREP "Hello, World" stdout], [], [ignore])
 done
 
 AT_CLEANUP
diff --git a/tests/demo.at b/tests/demo.at
index 6a7556d7..eba68c2a 100644
--- a/tests/demo.at
+++ b/tests/demo.at
@@ -566,7 +566,7 @@ hc-direct: $(hell_OBJECTS) $(hell_DEPENDENCIES) $(libdir)/libhello.la
 	@rm -f hc-direct
 	@echo "You may ignore any linking errors from the following command:"
 	@shlib=./$(objdir)/libhello.a; \
-	  eval "`grep '^library_names' libhello.la`"; \
+	  eval "`$(GREP) '^library_names' libhello.la`"; \
 	  for lib in $$library_names; do \
 	    shlib="./$(objdir)/$$lib"; \
 	  done; \
@@ -593,7 +593,7 @@ hc-libpath: $(hell_OBJECTS) $(hell_DEPENDENCIES) $(libdir)/libhello.la
 	@rm -f hc-libpath
 	@echo "You may ignore any linking errors from the following command:"
 	@$(SET_HARDCODE_FLAGS); \
-	  eval `$(LIBTOOL) --config | grep '^shlibpath_var='`; \
+	  eval `$(LIBTOOL) --config | $(GREP) '^shlibpath_var='`; \
 	  libdir=$(libdir); \
 	  flag=`eval echo \"$$hardcode_libdir_flag_spec\"`; \
 	  echo "$$shlibpath_var=./$(objdir) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(hell_OBJECTS) -lhello $(LIBS) $(LIBM) $$flag || echo unsupported > $@"; \
@@ -668,7 +668,7 @@ for file in hc-*; do
   elif $FGREP "$objdir" $file > /dev/null 2>&1; then
     # We retry fgrep without tr, in case the above lead to a false negative.
     hardcoded=yes
-  elif ($SED -e '1!d' $file | grep 'unsupported') >/dev/null 2>&1; then
+  elif ($SED -e '1!d' $file | $GREP 'unsupported') >/dev/null 2>&1; then
     hardcoded=unsupported
   fi
 
diff --git a/tests/destdir.at b/tests/destdir.at
index 978438f0..0f6af50e 100644
--- a/tests/destdir.at
+++ b/tests/destdir.at
@@ -27,7 +27,7 @@ AT_BANNER([DESTDIR tests])
 # Common setup for the next few tests.
 m4_pushdef([_LT_DIRSETUP],
 [# DESTDIR installs do not work with relink at install time.
-AT_XFAIL_IF([eval `$LIBTOOL --config | grep '^fast_install='`
+AT_XFAIL_IF([eval `$LIBTOOL --config | $GREP '^fast_install='`
            case $fast_install in no) :;; *) false;; esac])
 LDFLAGS="$LDFLAGS -no-undefined"
 if test -n "$we_are_on_a_safe_system"; then # let's read shorter cmdlines.
diff --git a/tests/dumpbin-symbols.at b/tests/dumpbin-symbols.at
index 39a964cf..6fffd8c7 100644
--- a/tests/dumpbin-symbols.at
+++ b/tests/dumpbin-symbols.at
@@ -39,7 +39,7 @@ int some_variable = 0;
 
 AT_CHECK([$CC $CPPFLAGS $CFLAGS -c variable.c], [], [ignore], [ignore])
 AT_CHECK([$NM variable.$OBJEXT], [], [stdout], [ignore])
-AT_CHECK([grep 'External.*some_variable' stdout || exit 77], [], [ignore])
+AT_CHECK([$GREP 'External.*some_variable' stdout || exit 77], [], [ignore])
 
 eval `$LIBTOOL --config | $EGREP '^(global_symbol_pipe)='`
 
@@ -106,6 +106,6 @@ String Table Size = 0x11 bytes
 # Check if the _convenience symbol from section SECT3 in conv.lib is
 # present even if section SECT3 in foo.obj is hidden.
 AT_CHECK([< dumpbin-output eval "$global_symbol_pipe"], [], [stdout])
-AT_CHECK([grep convenience stdout], [], [ignore])
+AT_CHECK([$GREP convenience stdout], [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/early-libtool.at b/tests/early-libtool.at
index 7c59594c..161780fe 100644
--- a/tests/early-libtool.at
+++ b/tests/early-libtool.at
@@ -112,8 +112,8 @@ LT_AT_CONFIGURE
 LT_AT_MAKE
 
 LT_AT_EXEC_CHECK([./hell], [0], [stdout])
-AT_CHECK([grep 'Welcome to GNU Hell' stdout], [], [ignore])
-AT_CHECK([grep 'This is not GNU Hello.' stdout],
+AT_CHECK([$GREP 'Welcome to GNU Hell' stdout], [], [ignore])
+AT_CHECK([$GREP 'This is not GNU Hello.' stdout],
 	 [], [ignore])
 
 AT_CLEANUP
@@ -219,8 +219,8 @@ LT_AT_CONFIGURE
 LT_AT_MAKE
 
 LT_AT_EXEC_CHECK([./hell], [0], [stdout])
-AT_CHECK([grep 'Welcome to GNU Hell' stdout], [], [ignore])
-AT_CHECK([grep 'This is not GNU Hello.' stdout], [], [ignore])
+AT_CHECK([$GREP 'Welcome to GNU Hell' stdout], [], [ignore])
+AT_CHECK([$GREP 'This is not GNU Hello.' stdout], [], [ignore])
 
 # Make sure config.status --recheck updates the libtool script
 rm libtool
diff --git a/tests/execute-mode.at b/tests/execute-mode.at
index e039b2da..ba421a9b 100644
--- a/tests/execute-mode.at
+++ b/tests/execute-mode.at
@@ -214,8 +214,8 @@ done
 # Check that .la files are not transformed by the wrapper searching loop.
 AT_CHECK([$LIBTOOL --mode=execute echo ./main$EXEEXT liba.lo libfakelib.la], [], [stdout])
 # This could be .libs/lt-main or similar (or just plain 'main').
-AT_CHECK([grep main stdout], [], [ignore])
-AT_CHECK([grep liba.lo stdout], [], [ignore])
-AT_CHECK([grep libfakelib.la stdout], [], [ignore])
+AT_CHECK([$GREP main stdout], [], [ignore])
+AT_CHECK([$GREP liba.lo stdout], [], [ignore])
+AT_CHECK([$GREP libfakelib.la stdout], [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/export-def.at b/tests/export-def.at
index 55a513ab..e5c98164 100755
--- a/tests/export-def.at
+++ b/tests/export-def.at
@@ -25,7 +25,7 @@
 AT_SETUP([export from a DLL with a .def file])
 AT_KEYWORDS([libtool])
 
-AT_CHECK([$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)],
+AT_CHECK([$LIBTOOL --features | $GREP 'disable shared libraries' && (exit 77)],
 	 [1], [ignore])
 eval `$LIBTOOL --config | $EGREP '^(shrext_cmds|libname_spec|soname_spec)='`
 
diff --git a/tests/export.at b/tests/export.at
index 029656b5..d66198a0 100644
--- a/tests/export.at
+++ b/tests/export.at
@@ -25,7 +25,7 @@
 AT_SETUP([Export test])
 AT_KEYWORDS([libtool])
 
-AT_CHECK([$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)],
+AT_CHECK([$LIBTOOL --features | $GREP 'disable shared libraries' && (exit 77)],
 	 [1], [ignore])
 AT_CHECK([eval `$LIBTOOL --config | $SED -n '/^archive_expsym_cmds=/,/^$/p'`
 	  test -n "$archive_expsym_cmds" || echo false >can-hide
diff --git a/tests/f77demo.at b/tests/f77demo.at
index ac96b977..d30c1c72 100644
--- a/tests/f77demo.at
+++ b/tests/f77demo.at
@@ -263,7 +263,7 @@ LT_AT_HOST_DATA([expout],
 LT_AT_EXEC_CHECK([./fprogram], 0, [stdout])
 
 # A weaker output content check that is agnostic to the issues above.
-AT_CHECK([grep 'Welcome to GNU libtool Fortran demo!' stdout],
+AT_CHECK([$GREP 'Welcome to GNU libtool Fortran demo!' stdout],
          [0], [ignore])
 
 # Similarly, we can't reliably compare actual output with the following.
@@ -284,7 +284,7 @@ The Fortran 77 subroutine is ok!
 LT_AT_EXEC_CHECK([./cprogram], 0, [stdout])
 
 # A weaker output content check that is agnostic to the issues above.
-AT_CHECK([grep 'Welcome to GNU libtool mixed C/Fortran demo!' stdout],
+AT_CHECK([$GREP 'Welcome to GNU libtool mixed C/Fortran demo!' stdout],
          [0], [ignore])
 ])
 
diff --git a/tests/fcdemo.at b/tests/fcdemo.at
index f8465fee..ff397688 100644
--- a/tests/fcdemo.at
+++ b/tests/fcdemo.at
@@ -277,7 +277,7 @@ LT_AT_HOST_DATA([expout],
 LT_AT_EXEC_CHECK([./fprogram], 0, [stdout])
 
 # A weaker output content check that is agnostic to the issues above.
-AT_CHECK([grep 'Welcome to GNU libtool Fortran demo!' stdout],
+AT_CHECK([$GREP 'Welcome to GNU libtool Fortran demo!' stdout],
          [0], [ignore])
 
 # Similarly, we can't reliably compare actual output with the following.
@@ -298,7 +298,7 @@ The Fortran subroutine is ok!
 LT_AT_EXEC_CHECK([./cprogram], 0, [stdout])
 
 # A weaker output content check that is agnostic to the issues above.
-AT_CHECK([grep 'Welcome to GNU libtool mixed C/Fortran demo!' stdout],
+AT_CHECK([$GREP 'Welcome to GNU libtool mixed C/Fortran demo!' stdout],
          [0], [ignore])
 ])
 
diff --git a/tests/flags.at b/tests/flags.at
index 3024f2b4..df04ea3f 100644
--- a/tests/flags.at
+++ b/tests/flags.at
@@ -59,7 +59,7 @@ compile="$GCJ $GCJFLAGS" link="$GCJ $GCJFLAGS $LDFLAGS" source=a.java
 ])
 
 # Linker flags are not passed to the archiver, so don't test static libraries.
-if $LIBTOOL --features | grep 'enable shared libraries'; then
+if $LIBTOOL --features | $GREP 'enable shared libraries'; then
   library_and_module='library.la "module.la -module -avoid-version"'
 else
   library_and_module=
diff --git a/tests/help.at b/tests/help.at
index a8e8f8f4..3442255d 100644
--- a/tests/help.at
+++ b/tests/help.at
@@ -29,15 +29,15 @@ AT_KEYWORDS([libtoolize])
 
 AT_CHECK([$LIBTOOLIZE --help], [], [ignore])
 AT_CHECK([$LIBTOOLIZE --version], [], [stdout])
-AT_CHECK([grep 'Copyright.*Free Software Foundation' stdout], [], [ignore])
+AT_CHECK([$GREP 'Copyright.*Free Software Foundation' stdout], [], [ignore])
 AT_CHECK([$LIBTOOL --help], [], [ignore])
 AT_CHECK([$LIBTOOL --help-all], [], [ignore])
 AT_CHECK([$LIBTOOL --version], [], [stdout])
-AT_CHECK([grep 'Copyright.*Free Software Foundation' stdout], [], [ignore])
+AT_CHECK([$GREP 'Copyright.*Free Software Foundation' stdout], [], [ignore])
 
 AT_CHECK([$LIBTOOL], [1], [stdout], [stderr])
-AT_CHECK([grep 'specify a MODE' stderr], [], [ignore])
-AT_CHECK([grep ' --help' stdout], [], [ignore])
+AT_CHECK([$GREP 'specify a MODE' stderr], [], [ignore])
+AT_CHECK([$GREP ' --help' stdout], [], [ignore])
 
 AT_CLEANUP
 
@@ -122,11 +122,11 @@ AT_CHECK([case "$LIBTOOL $CC $CPPFLAGS $CFLAGS $LDFLAGS " in ]dnl
 check_trace ()
 {
   if test X--debug = "X$trace"; then
-    AT_CHECK([grep 'enabling shell trace mode' stdout stderr], [0], [ignore])
-    AT_CHECK([grep ' --mode' stderr], [0], [ignore])
+    AT_CHECK([$GREP 'enabling shell trace mode' stdout stderr], [0], [ignore])
+    AT_CHECK([$GREP ' --mode' stderr], [0], [ignore])
   else
-    AT_CHECK([grep 'enabling shell trace mode' stdout stderr], [1])
-    AT_CHECK([grep ' --mode' stderr], [1])
+    AT_CHECK([$GREP 'enabling shell trace mode' stdout stderr], [1])
+    AT_CHECK([$GREP ' --mode' stderr], [1])
   fi
 }
 
@@ -163,12 +163,12 @@ for trace in '' --debug; do
   # it was passed at link mode.
   AT_CHECK([$orig_LIBTOOL --mode=install $lt_INSTALL liba.la libb.la $libdir],
 	   [], [stdout], [stderr])
-  if grep ': relinking ' stdout stderr; then
+  if $GREP ': relinking ' stdout stderr; then
     if test X--debug = "X$trace"; then
-      AT_CHECK([grep ' --mode=relink' stdout stderr | grep ' --debug '],
+      AT_CHECK([$GREP ' --mode=relink' stdout stderr | $GREP ' --debug '],
 	       [0], [ignore])
     else
-      AT_CHECK([grep ' --mode=relink' stdout stderr | grep ' --debug '],
+      AT_CHECK([$GREP ' --mode=relink' stdout stderr | $GREP ' --debug '],
 	       [1])
     fi
   fi
diff --git a/tests/inherited_flags.at b/tests/inherited_flags.at
index b132ce83..9f66987b 100644
--- a/tests/inherited_flags.at
+++ b/tests/inherited_flags.at
@@ -79,26 +79,26 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo
 # 'llt_[[ui]]nlikely_existing_lib.*llt_[[ui]]nlikely_existing_lib'
 # here.  This fails on win32/MSVC because the generated command lines have a
 # different syntax.  So drop the first 'l'.
-AT_CHECK([$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)], [1], [ignore])
-AT_CHECK([grep 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib' stdout],
+AT_CHECK([$LIBTOOL --features | $GREP 'disable shared libraries' && (exit 77)], [1], [ignore])
+AT_CHECK([$GREP 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib' stdout],
 	 [0],[ignore],[ignore])
 AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.lo -no-undefined -rpath /nonexistent  ./libfoo.la ./libbar.la],
 	[ignore],[stdout],[ignore])
-AT_CHECK([grep 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib' stdout],
+AT_CHECK([$GREP 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib' stdout],
 	 [0],[ignore],[ignore])
 
 # now check for duplicates
 AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la baz.lo -no-undefined -rpath /nonexistent ./libfoo.la ./libbar.la ./libboth.la],
 	 [ignore],[stdout],[ignore])
-AT_CHECK([grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
+AT_CHECK([$GREP 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
 	 [1],[ignore],[ignore])
-AT_CHECK([grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout],
+AT_CHECK([$GREP 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout],
 	 [1],[ignore],[ignore])
 AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.lo -no-undefined -rpath /nonexistent  ./libfoo.la ./libbar.la ./libboth.la],
 	[ignore],[stdout],[ignore])
-AT_CHECK([grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
+AT_CHECK([$GREP 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
 	 [1],[ignore],[ignore])
-AT_CHECK([grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout],
+AT_CHECK([$GREP 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout],
 	 [1],[ignore],[ignore])
 
 mv libboth.la libboth.la.bak
@@ -107,7 +107,7 @@ rm libboth.la.bak
 
 AT_CHECK([$LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la -no-undefined -rpath /nonexistent],
 	 [], [stdout], [ignore])
-AT_CHECK([grep Cocoa.ltframework stdout], [1], [], [])
-AT_CHECK([grep ' -framework Cocoa' stdout], [0], [ignore], [])
+AT_CHECK([$GREP Cocoa.ltframework stdout], [1], [], [])
+AT_CHECK([$GREP ' -framework Cocoa' stdout], [0], [ignore], [])
 
 AT_CLEANUP
diff --git a/tests/install.at b/tests/install.at
index b9b2e84f..2c377ee8 100644
--- a/tests/install.at
+++ b/tests/install.at
@@ -28,7 +28,7 @@ AT_KEYWORDS([libtool])
 # Ensure that install_override_mode overrides the mode of the shared
 # library (and only the shared library).
 
-AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
+AT_CHECK([$LIBTOOL --features | $GREP 'enable shared libraries' || exit 77],
 	 [], [ignore])
 $SED 's|^\(install_override_mode\)=.*|\1=755|' < $LIBTOOL > ./libtool
 LIBTOOL=./libtool
@@ -43,10 +43,10 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la a.lo ]dnl
 	 [-rpath $inst -no-undefined], [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL liba.la $inst],
 	 [], [stdout], [ignore])
-AT_CHECK([grep ' -m 755' stdout], [], [ignore])
+AT_CHECK([$GREP ' -m 755' stdout], [], [ignore])
 AT_CHECK([$LIBTOOL --mode=install $lt_INSTALL -m 644 liba.la $inst],
 	 [], [stdout], [ignore])
-AT_CHECK([grep ' -m 755' stdout], [], [ignore])
-AT_CHECK([grep ' -m 644.*liba.la' stdout], [], [ignore])
+AT_CHECK([$GREP ' -m 755' stdout], [], [ignore])
+AT_CHECK([$GREP ' -m 644.*liba.la' stdout], [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/lalib-syntax.at b/tests/lalib-syntax.at
index 0232b302..6447c0f8 100644
--- a/tests/lalib-syntax.at
+++ b/tests/lalib-syntax.at
@@ -131,7 +131,7 @@ libdir='/somewhere'
 for file in ./missing-closing-quote.la ./wrong-quotes.la \
 	    ./no-dlname.la ./nonexistent-dlname.la; do
   LT_AT_EXEC_CHECK([./main], [1], [stdout], [ignore], [$file])
-  AT_CHECK([grep 'plugin failed to open' stdout], [], [ignore])
+  AT_CHECK([$GREP 'plugin failed to open' stdout], [], [ignore])
 done
 
 AT_CLEANUP
diff --git a/tests/libtool.at b/tests/libtool.at
index d3812bf9..6d174d02 100755
--- a/tests/libtool.at
+++ b/tests/libtool.at
@@ -33,10 +33,10 @@ AT_BANNER([Basic libtool operation.])
 AT_SETUP([check help output])
 
 AT_CHECK([$LIBTOOL --help], [0], [stdout], [stderr])
-AT_CHECK([grep '^Usage:' stdout stderr], [0], [ignore])
+AT_CHECK([$GREP '^Usage:' stdout stderr], [0], [ignore])
 
 AT_CHECK([$LIBTOOL --mode=link --help], [0], [stdout], [stderr])
-AT_CHECK([grep '^Usage:' stdout stderr], [0], [ignore])
+AT_CHECK([$GREP '^Usage:' stdout stderr], [0], [ignore])
 
 AT_CLEANUP
 
@@ -48,7 +48,7 @@ AT_CLEANUP
 AT_SETUP([diagnose no mode specified])
 
 AT_CHECK([$LIBTOOL], [1], [ignore], [stderr])
-AT_CHECK([grep 'you must specify a MODE' stderr], [0], [ignore])
+AT_CHECK([$GREP 'you must specify a MODE' stderr], [0], [ignore])
 
 AT_CLEANUP
 
@@ -59,7 +59,7 @@ AT_CLEANUP
 
 AT_SETUP([quote shell meta-characters in filenames])
 
-eval `$LIBTOOL --config | grep '^wl='`
+eval `$LIBTOOL --config | $GREP '^wl='`
 
 # Do the torture test.
 for mode in compile link install; do
@@ -103,7 +103,7 @@ for mode in compile link install; do
   # We must not attempt to match $preargs in the output, because libtool
   # may modify them.  For example, on Cygwin, 'libtool --mode=link gcc -o
   # foo foo.o'  becomes 'gcc -o foo.exe foo.o'.
-  AT_CHECK([grep "$mode:.*$match_preflag$flag:test " stdout], [0], [ignore])
+  AT_CHECK([$GREP "$mode:.*$match_preflag$flag:test " stdout], [0], [ignore])
 
 
   # Non-trivial...
@@ -116,14 +116,14 @@ for mode in compile link install; do
 	   [0], [stdout])
   # NOTE: we use "..."'"'"..." to insert a literal quote into the expression
   #       because "...\"..." is not expanded consistently by all shells.
-  AT_CHECK([grep "$mode:.*$match_preflag"'"\?'"$flag\\\\\\\\:test\\\\\\\\"'"\? ' stdout],
+  AT_CHECK([$GREP "$mode:.*$match_preflag"'"\?'"$flag\\\\\\\\:test\\\\\\\\"'"\? ' stdout],
 	      [0], [ignore])
 
   # Shell metacharacters that should be backslashified by libtool.
   for mchar in \" \` \$; do
     AT_CHECK([$LIBTOOL -n --mode=$mode $preargs $preflag"$flag$mchar:test$mchar" $postargs],
 	     [0], [stdout])
-    AT_CHECK([grep "$mode:.*$match_preflag"'"'"\?$flag\\\\$mchar:test\\\\$mchar"'"'"\? " stdout], [0], [ignore])
+    AT_CHECK([$GREP "$mode:.*$match_preflag"'"'"\?$flag\\\\$mchar:test\\\\$mchar"'"'"\? " stdout], [0], [ignore])
   done
 
   # Shell metacharacters that should be double quoted by libtool, and need
@@ -132,7 +132,7 @@ for mode in compile link install; do
 
     AT_CHECK([$LIBTOOL -n --mode=$mode $preargs $preflag"$flag$mchar:test$mchar" $postargs],
 	     [0], [stdout])
-    AT_CHECK([grep "$mode:.*$match_preflag\"$flag\\$mchar:test\\$mchar\" " stdout], [0], [ignore])
+    AT_CHECK([$GREP "$mode:.*$match_preflag\"$flag\\$mchar:test\\$mchar\" " stdout], [0], [ignore])
   done
 
   # Metacharacters that should be double quoted by libtool, but which are
@@ -141,7 +141,7 @@ for mode in compile link install; do
 
     AT_CHECK([$LIBTOOL -n --mode=$mode $preargs $preflag"$flag$mchar:test$mchar" $postargs],
 	     [0], [stdout])
-    AT_CHECK([grep "$mode:.*$match_preflag\"$flag$mchar:test$mchar\" " stdout], [0], [ignore])
+    AT_CHECK([$GREP "$mode:.*$match_preflag\"$flag$mchar:test$mchar\" " stdout], [0], [ignore])
   done
 done
 
@@ -163,14 +163,14 @@ for ext in $extensions; do
   # Try a sample compile command.
   AT_CHECK([$LIBTOOL -n --mode=compile compiler -c foo.$ext],
            [1], [ignore], [stderr])
-  AT_CHECK([grep 'cannot' stderr], [1], [ignore])
+  AT_CHECK([$GREP 'cannot' stderr], [1], [ignore])
 done
 
 # Make sure that invalid suffixes are not recognized.
 for name in $bad_names; do
   AT_CHECK([$LIBTOOL -n --mode=compile compiler -c $name],
            [1], [ignore], [stderr])
-  AT_CHECK([grep 'cannot' stderr], [0], [ignore])
+  AT_CHECK([$GREP 'cannot' stderr], [0], [ignore])
 done
 
 AT_CLEANUP
@@ -205,7 +205,7 @@ AT_CLEANUP
 AT_SETUP([check objectlist file operation])
 
 AT_CHECK([$LIBTOOL -n --mode=link $CC -objectlist nonexistent], [1], [ignore], [stderr])
-AT_CHECK([grep 'nonexistent' stderr], [0], [ignore])
+AT_CHECK([$GREP 'nonexistent' stderr], [0], [ignore])
 
 AT_CLEANUP
 
@@ -233,12 +233,12 @@ AT_CHECK([test -n "$traced_tags"])
 for tag in $traced_tags; do
   AT_CHECK([$LIBTOOL -n --mode=link --tag=$tag compiler -o liba.la foo.lo],
            [], [ignore], [stderr])
-  AT_CHECK([grep 'ignoring unknown tag' stderr], [1], [ignore])
+  AT_CHECK([$GREP 'ignoring unknown tag' stderr], [1], [ignore])
 done
 
 # Ensure the above command would have failed for unknown tags
 AT_CHECK([$LIBTOOL -n --mode=link --tag=UnKnOwN compiler -o liba.la foo.lo],
          [], [ignore], [stderr])
-AT_CHECK([grep 'ignoring unknown tag' stderr], [0], [ignore])
+AT_CHECK([$GREP 'ignoring unknown tag' stderr], [0], [ignore])
 
 AT_CLEANUP
diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index eab6d842..cdb307b1 100644
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -1160,7 +1160,7 @@ AT_DATA([libltdl/acinclude.m4],
 LT_AT_CHECK_LIBTOOLIZE([--copy --force --ltdl], 0, [ignore])
 
 # check files are left as expected
-AT_CHECK([grep 'keep me' acinclude.m4], 0, [ignore])
+AT_CHECK([$GREP 'keep me' acinclude.m4], 0, [ignore])
 AT_CHECK([test -f libltdl/acinclude.m4], 1, [ignore], [ignore])
 
 AT_CLEANUP
diff --git a/tests/localization.at b/tests/localization.at
index 0cb2cfd1..0fc8924f 100644
--- a/tests/localization.at
+++ b/tests/localization.at
@@ -57,7 +57,7 @@ LT_AT_NORMALIZE_COMPILER_OUTPUT([stderr], [libtool-stderr])
 #   selections and the available locales.
 #
 #   Continuing processing using the "C" locale.
-AT_CHECK([grep locale stdout stderr && exit 77], [1])
+AT_CHECK([$GREP locale stdout stderr && exit 77], [1])
 AT_CHECK([diff expected-stderr libtool-stderr])
 AT_CHECK([diff expected-stdout libtool-stdout])
 
@@ -66,7 +66,7 @@ m4_define([lt_localize],
 [[LANGUAGE='a; nosuchprogram " '\''  & $x /#+*(){}|,:`\ !%']])
 AT_CHECK([(lt_localize $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c b.c)],
 	 [0], [stdout], [stderr])
-AT_CHECK([grep nosuchprogram stdout stderr], [1])
+AT_CHECK([$GREP nosuchprogram stdout stderr], [1])
 
 m4_popdef([lt_localize])
 
diff --git a/tests/lt_dladvise.at b/tests/lt_dladvise.at
index ccb563c6..61d411d4 100644
--- a/tests/lt_dladvise.at
+++ b/tests/lt_dladvise.at
@@ -329,7 +329,7 @@ dlpreloadable='preload'
 # ------------------------------------------------------------------------- #
 
 have_shared=false
-$LIBTOOL --features | grep 'enable shared libraries' >/dev/null && have_shared=:
+$LIBTOOL --features | $GREP 'enable shared libraries' >/dev/null && have_shared=:
 
 case $host_os,$have_shared in
 cygwin* | mingw* | cegcc* | *,false)
diff --git a/tests/lt_dlopen.at b/tests/lt_dlopen.at
index b837175f..d4a8b510 100644
--- a/tests/lt_dlopen.at
+++ b/tests/lt_dlopen.at
@@ -27,7 +27,7 @@ AT_KEYWORDS([libltdl])
 AT_XFAIL_IF([:])
 
 # This test only works if the system allows undefined symbols.
-eval `$LIBTOOL --config | grep '^allow_undefined_flag='`
+eval `$LIBTOOL --config | $GREP '^allow_undefined_flag='`
 AT_CHECK([test unsupported != "$allow_undefined_flag" || exit 77])
 
 AT_DATA([main.c],
@@ -98,6 +98,6 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.$OBJEXT
 
 LT_AT_EXEC_CHECK([./main], [], [ignore], [ignore], [./good-plugin.la])
 LT_AT_EXEC_CHECK([./main], [1], [ignore], [stderr], [./missing-symbol-plugin.la])
-AT_CHECK([grep 'missing symbol' stderr], [], [ignore])
+AT_CHECK([$GREP 'missing symbol' stderr], [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/lt_dlopenext.at b/tests/lt_dlopenext.at
index 78edd472..4c32b44c 100644
--- a/tests/lt_dlopenext.at
+++ b/tests/lt_dlopenext.at
@@ -24,7 +24,7 @@ AT_SETUP([lt_dlopenext error messages])
 AT_KEYWORDS([libltdl])
 
 # This test requires shared library support.
-AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
+AT_CHECK([$LIBTOOL --features | $GREP 'enable shared libraries' || exit 77],
 	 [], [ignore])
 
 prefix=`pwd`/inst
@@ -234,7 +234,7 @@ for lafile in $have_lafile; do
   for dir in inst/lib "$libdir"; do
     LT_AT_EXEC_CHECK([./ltdl-loader], [], [stdout], [ignore],
 		     [$dir/simple-module World])
-    AT_CHECK([grep "Hello, World" stdout], [], [ignore])
+    AT_CHECK([$GREP "Hello, World" stdout], [], [ignore])
 
     for var in MODULE_PATH LTDL_LIBRARY_PATH $shlibpath_var
     do
@@ -242,7 +242,7 @@ for lafile in $have_lafile; do
       export $var
       LT_AT_EXEC_CHECK([./ltdl-loader], [], [stdout], [ignore],
 		       [simple-module World])
-      AT_CHECK([grep "Hello, World" stdout], [], [ignore])
+      AT_CHECK([$GREP "Hello, World" stdout], [], [ignore])
       $unset $var || eval $var=
     done
   done
diff --git a/tests/ltdl-api.at b/tests/ltdl-api.at
index 02154844..b3066690 100644
--- a/tests/ltdl-api.at
+++ b/tests/ltdl-api.at
@@ -32,8 +32,8 @@ AT_CHECK([test -f "$argz_o" || exit 77])
 AT_CHECK([eval "$NM \"\$argz_o\" | $global_symbol_pipe"],
 	 [], [stdout], [ignore])
 # Check for global symbols beginning with "argz_"
-AT_CHECK([grep "^T argz_" stdout], [1])
+AT_CHECK([$GREP "^T argz_" stdout], [1])
 # and also for the _ prefixed version "_argz_"
-AT_CHECK([grep "^T _argz_" stdout], [1])
+AT_CHECK([$GREP "^T _argz_" stdout], [1])
 
 AT_CLEANUP
diff --git a/tests/ltdl-libdir.at b/tests/ltdl-libdir.at
index ea3334a0..9f53dd33 100644
--- a/tests/ltdl-libdir.at
+++ b/tests/ltdl-libdir.at
@@ -24,7 +24,7 @@ AT_SETUP([libdir of installed modules])
 AT_KEYWORDS([libltdl])
 
 # This test requires shared library support.
-AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
+AT_CHECK([$LIBTOOL --features | $GREP 'enable shared libraries' || exit 77],
 	 [], [ignore])
 
 # With MinGW, try Windows-style paths only.
diff --git a/tests/mdemo.at b/tests/mdemo.at
index 55e73004..8a96fb0f 100644
--- a/tests/mdemo.at
+++ b/tests/mdemo.at
@@ -601,13 +601,13 @@ prefixdir=`pwd`/_inst
 m4_define([_LT_CHECK_EXECUTE],
 [LT_AT_MAKE
 LT_AT_EXEC_CHECK([./mdemo_static], 0, [ignore], [],
-    [./foo1.la ./libfoo2.la | grep '^try_iterate: '])
+    [./foo1.la ./libfoo2.la | $GREP '^try_iterate: '])
 LT_AT_EXEC_CHECK([./mdemo], 0, [ignore], [],
-    [./foo1.la ./libfoo2.la | grep '^try_iterate: '])
+    [./foo1.la ./libfoo2.la | $GREP '^try_iterate: '])
 LT_AT_EXEC_CHECK([./mdemo_static], 0, [ignore], [],
-    [`pwd`/foo1.la `pwd`/libfoo2.la | grep '^try_iterate: '])
+    [`pwd`/foo1.la `pwd`/libfoo2.la | $GREP '^try_iterate: '])
 LT_AT_EXEC_CHECK([./mdemo], 0, [ignore], [],
-    [`pwd`/foo1.la `pwd`/libfoo2.la | grep '^try_iterate: '])
+    [`pwd`/foo1.la `pwd`/libfoo2.la | $GREP '^try_iterate: '])
 ])
 
 # _LT_CHECK_INSTALL
@@ -620,9 +620,9 @@ m4_define([_LT_CHECK_INSTALL],
 PATH=$prefixdir/lib:$PATH
 
 LT_AT_EXEC_CHECK([$prefixdir/bin/mdemo_static], 0, [ignore], [],
-    [$prefixdir/lib/foo1.la $prefixdir/lib/libfoo2.la | grep '^try_iterate: '])
+    [$prefixdir/lib/foo1.la $prefixdir/lib/libfoo2.la | $GREP '^try_iterate: '])
 LT_AT_EXEC_CHECK([$prefixdir/bin/mdemo], 0, [ignore], [],
-    [$prefixdir/lib/foo1.la $prefixdir/lib/libfoo2.la | grep '^try_iterate: '])
+    [$prefixdir/lib/foo1.la $prefixdir/lib/libfoo2.la | $GREP '^try_iterate: '])
 ])
 
 
diff --git a/tests/old-m4-iface.at b/tests/old-m4-iface.at
index b5a0e482..6d1d6769 100644
--- a/tests/old-m4-iface.at
+++ b/tests/old-m4-iface.at
@@ -98,10 +98,10 @@ $SED '/AM_PROG_LIBTOOL/d' configure.in >configure.int
 mv -f configure.int configure.in
 AT_CHECK([$LIBTOOLIZE -n], [0], [stdout], [stderr])
 # ensure no shell errors:
-AT_CHECK([grep -v "^libtoolize: " stderr], [1])
-AT_CHECK([grep "Remember to add.*LT_INIT.*to configure.in" stdout], [0], [ignore])
-AT_CHECK([grep "Consider adding.*LT_WITH_LTDL" stdout], [1])
-AT_CHECK([grep "Remember to add.*LT_CONFIG_LTDL_DIR" stdout], [1])
+AT_CHECK([$GREP -v "^libtoolize: " stderr], [1])
+AT_CHECK([$GREP "Remember to add.*LT_INIT.*to configure.in" stdout], [0], [ignore])
+AT_CHECK([$GREP "Consider adding.*LT_WITH_LTDL" stdout], [1])
+AT_CHECK([$GREP "Remember to add.*LT_CONFIG_LTDL_DIR" stdout], [1])
 
 AT_CLEANUP
 
diff --git a/tests/pic_flag.at b/tests/pic_flag.at
index d8fb1176..ec22179c 100644
--- a/tests/pic_flag.at
+++ b/tests/pic_flag.at
@@ -36,8 +36,8 @@ C_pic_flag='-fpic -DPIC'
 AT_CHECK([$CC $CPPFLAGS $CFLAGS $C_pic_flag -c foo.c || exit 77],
 	 [], [stdout], [stderr])
 # The configure test for the PIC flag also checks for warnings.
-AT_CHECK([grep fpic stdout stderr && exit 77], [1])
-AT_CHECK([[grep '[uU]nknown.*option' stdout stderr && exit 77]], [1])
+AT_CHECK([$GREP fpic stdout stderr && exit 77], [1])
+AT_CHECK([[$GREP '[uU]nknown.*option' stdout stderr && exit 77]], [1])
 
 CXX_pic_flag='-fpic -DPIC'
 if $CXX $CPPFLAGS $CXXFLAGS $CXX_pic_flag -c foo.cpp; then :; else
@@ -57,7 +57,7 @@ LT_AT_CONFIGURE([lt_cv_prog_compiler_pic="$C_pic_flag" ]dnl
 		[./configure])
 : ${MAKE=make}
 AT_CHECK([$MAKE], [], [stdout], [ignore])
-AT_CHECK([if ./libtool --features | grep 'enable shared libraries'; then ]dnl
-	 [  grep ' -fpic' stdout; else exit 77; fi], [], [ignore], [ignore])
+AT_CHECK([if ./libtool --features | $GREP 'enable shared libraries'; then ]dnl
+	 [  $GREP ' -fpic' stdout; else exit 77; fi], [], [ignore], [ignore])
 
 AT_CLEANUP
diff --git a/tests/resident.at b/tests/resident.at
index 4a8d0d35..84870c11 100644
--- a/tests/resident.at
+++ b/tests/resident.at
@@ -143,6 +143,6 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.$OBJEXT
 	 [-dlopen plugin.la $LIBLTDL],
 	 [], [ignore], [ignore])
 LT_AT_EXEC_CHECK([./main], [], [stdout], [ignore], [./plugin.la])
-AT_CHECK([grep 'called from atexit handler' stdout], [], [ignore])
+AT_CHECK([$GREP 'called from atexit handler' stdout], [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/runpath-in-lalib.at b/tests/runpath-in-lalib.at
index 2b6b5225..a4ee1262 100644
--- a/tests/runpath-in-lalib.at
+++ b/tests/runpath-in-lalib.at
@@ -58,8 +58,8 @@ AT_CHECK([$LIBTOOL --mode=install cp liba.la $libdir/liba.la], [], [ignore], [ig
 AT_CHECK([$LIBTOOL --mode=install cp libb.la $libdir/libb.la], [], [ignore], [ignore])
 AT_CHECK([$LIBTOOL --mode=install cp m$EXEEXT $bindir/m$EXEEXT], [], [ignore], [ignore])
 
-AT_CHECK([grep /foobar $libdir/liba.la], [], [ignore])
-AT_CHECK([grep /foobar $libdir/libb.la], [], [ignore])
+AT_CHECK([$GREP /foobar $libdir/liba.la], [], [ignore])
+AT_CHECK([$GREP /foobar $libdir/libb.la], [], [ignore])
 
 # TODO: check that m gets -R, too.
 
diff --git a/tests/search-path.at b/tests/search-path.at
index c3eb7202..641a71ce 100644
--- a/tests/search-path.at
+++ b/tests/search-path.at
@@ -77,7 +77,7 @@ HCURSOR get_cursor (void)
 }
 ]])
 
-eval "`$LIBTOOL --config | grep '^build_libtool_libs='`"
+eval "`$LIBTOOL --config | $GREP '^build_libtool_libs='`"
 AT_CHECK([test yes = "$build_libtool_libs" || exit 77])
 
 AT_CHECK([$LIBTOOL --mode=compile --tag=CC \
@@ -92,6 +92,6 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC --tag=disable-static \
 
 # If -luser32 was found, then libtool will build a shared library,
 # otherwise libtool will fall back to creating a static library.
-AT_CHECK([grep old_library=\'\' libgc.la], [], [ignore])
+AT_CHECK([$GREP old_library=\'\' libgc.la], [], [ignore])
 
 AT_CLEANUP
diff --git a/tests/static.at b/tests/static.at
index 42eedd5d..948538dc 100644
--- a/tests/static.at
+++ b/tests/static.at
@@ -86,8 +86,8 @@ bindir_broken=$prefix_broken/bin
 have_static=false
 have_shared=false
 per_deplib=false
-$LIBTOOL --features | grep 'enable static libraries' >/dev/null && have_static=:
-$LIBTOOL --features | grep 'enable shared libraries' >/dev/null && have_shared=:
+$LIBTOOL --features | $GREP 'enable static libraries' >/dev/null && have_static=:
+$LIBTOOL --features | $GREP 'enable shared libraries' >/dev/null && have_shared=:
 eval `$LIBTOOL --config |
         $EGREP '^(per_deplib_(static|dynamic)_flag|shlibpath_var|link_static_flag)='`
 if test -n "$per_deplib_static_flag" && test -n "$per_deplib_dynamic_flag"; then
diff --git a/tests/sysroot.at b/tests/sysroot.at
index f81a7abd..9a78d5e9 100644
--- a/tests/sysroot.at
+++ b/tests/sysroot.at
@@ -104,7 +104,7 @@ LT_AT_BOOTSTRAP([], [-I $abs_top_srcdir/libltdl/m4], [ignore],
 
 AT_CHECK([$MAKE install DESTDIR=$sysroot], [0], [ignore], [ignore])
 AT_CHECK([test -f "$sysroot/$prefix/lib/lib1.la"])
-AT_CHECK([grep -F "$sysroot" "$sysroot/$prefix/lib/lib1.la"], [1])
+AT_CHECK([$GREP -F "$sysroot" "$sysroot/$prefix/lib/lib1.la"], [1])
 cd ..
 
 # Build and install package 2.
@@ -145,7 +145,7 @@ LT_AT_BOOTSTRAP([], [-I $abs_top_srcdir/libltdl/m4], [ignore],
 
 AT_CHECK([$MAKE install DESTDIR=$sysroot], [0], [ignore], [ignore])
 AT_CHECK([test -f "$sysroot/$prefix/lib/lib2.la"])
-AT_CHECK([grep -F "$sysroot" "$sysroot/$prefix/lib/lib2.la"], [1])
+AT_CHECK([$GREP -F "$sysroot" "$sysroot/$prefix/lib/lib2.la"], [1])
 cd ..
 
 # Build and install a program.
@@ -185,10 +185,10 @@ LT_AT_BOOTSTRAP([], [-I $abs_top_srcdir/libltdl/m4], [ignore],
 
 AT_CHECK([$MAKE install DESTDIR=$sysroot], [0], [ignore], [ignore])
 AT_CHECK([test -f "$sysroot/$prefix/bin/prog$EXEEXT"])
-AT_CHECK([grep -F "$sysroot" "$sysroot/$prefix/bin/prog$EXEEXT"], [1])
-AT_CHECK([grep "'.*=" $sysroot/$prefix/lib/lib2.la], [0], [ignore])
+AT_CHECK([$GREP -F "$sysroot" "$sysroot/$prefix/bin/prog$EXEEXT"], [1])
+AT_CHECK([$GREP "'.*=" $sysroot/$prefix/lib/lib2.la], [0], [ignore])
 AT_CHECK([./libtool --mode=finish $sysroot/$prefix/lib/lib@<:@12@:>@.la], [0], [ignore])
-AT_CHECK([grep "'.*=" $sysroot/$prefix/lib/lib@<:@12@:>@.la], [1])
+AT_CHECK([$GREP "'.*=" $sysroot/$prefix/lib/lib@<:@12@:>@.la], [1])
 
 # missing tests
 # 1) pass absolute .la files
diff --git a/tests/template.at b/tests/template.at
index 6ffd0bd9..cb0c4b42 100644
--- a/tests/template.at
+++ b/tests/template.at
@@ -214,7 +214,7 @@ cd obj
 
 # If the compiler supports -c -o, we want to use it:
 # it may make a difference for templates
-eval `$LIBTOOL --tag=CXX --config | grep ^compiler_c_o=`
+eval `$LIBTOOL --tag=CXX --config | $GREP ^compiler_c_o=`
 case $compiler_c_o in
 yes)
   main_o=sub/main.$OBJEXT
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 6b2a550a..835f2535 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -35,7 +35,7 @@ for tool in ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF; do
   if eval \$$tool --version >/dev/null 2>&1; then :; else eval $tool=no; fi
 done
 export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF
-eval `$LIBTOOL --config | grep '^EGREP='`
+eval `$LIBTOOL --config | $GREP '^EGREP='`
 eval `$LIBTOOL --config | $EGREP '^(FGREP|objdir|objext)'`
 eval `$LIBTOOL --config | $EGREP '^(host|host_os|host_alias|build|build_alias|to_host_file_cmd|to_tool_file_cmd)='`
 configure_options=--prefix=/nonexistent
@@ -142,7 +142,7 @@ AT_KEYWORDS([autoconf])
 # --------------------------
 m4_define([LT_AT_AUTOMAKE],
 [AT_CHECK([$AUTOMAKE $1], [0], [ignore], [stderr],
-  [AT_CHECK([grep 'require .*but have' stderr && (exit 77)], [1])])
+  [AT_CHECK([$GREP 'require .*but have' stderr && (exit 77)], [1])])
 AT_XFAIL_IF([test no = "$AUTOMAKE"])
 AT_KEYWORDS([automake])
 ])
@@ -165,7 +165,7 @@ m4_define([LT_AT_AUTORECONF],
 	  [m4_define([AC_CONFIG_MACRO_DIRS], m4_defn([AC_CONFIG_MACRO_DIR]))])
 ]])
 AT_CHECK([$AUTORECONF $1], [0], [ignore], [stderr],
-  [AT_CHECK([grep 'require .*but have' stderr && (exit 77)], [1])])
+  [AT_CHECK([$GREP 'require .*but have' stderr && (exit 77)], [1])])
 AT_XFAIL_IF(
   [case ,$AUTORECONF,$AUTOCONF,$AUTOHEADER,$ACLOCAL,$AUTOMAKE, in *,no,*) :;; *) false;; esac])
 AT_KEYWORDS([autoconf automake])
diff --git a/tests/versioning.at b/tests/versioning.at
index d1922a9c..f1c465bb 100644
--- a/tests/versioning.at
+++ b/tests/versioning.at
@@ -110,7 +110,7 @@ done
 # Hypothesis: -version-info is ignored for convenience archives.
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba1.lo ]dnl
 	 [-version-info 0:0:0], [], [ignore], [stderr])
-AT_CHECK([grep 'version-info.*ignored for convenience' stderr], [], [ignore])
+AT_CHECK([$GREP 'version-info.*ignored for convenience' stderr], [], [ignore])
 
 # Hypothesis: the deprecated -version-number works.
 # Be sure not to use zero here, it's not portable.
@@ -131,7 +131,7 @@ done
 # Hypothesis: we diagnose when AGE is higher than CURRENT.
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la liba1.lo ]dnl
 	 [-version-info 1:3:2 -rpath $libdir], [1], [ignore], [stderr])
-AT_CHECK([grep 'AGE.*is greater than' stderr], [], [ignore])
+AT_CHECK([$GREP 'AGE.*is greater than' stderr], [], [ignore])
 
 # Hypothesis: we diagnose invalid values.
 for version_info in 1:2:3:4 -1 0:-1 0:0:-1; do
-- 
cgit v1.2.1