fgrep -> $FGREP, egrep -> $EGREP

diff --git a/tests/aclocali.test b/tests/aclocali.test
index dfd3d331473df00d7252be946b10f1419baf9b94..2ba6fe4961b50071dd02f52fd5a7d0f6d6e94b36 100755 (executable)
--- a/tests/aclocali.test
+++ b/tests/aclocali.test
@@ -22,4 +22,4 @@ $ACLOCAL -I macros || exit 1
 
 $AUTOMAKE || exit 1
 
-fgrep quux.m4 Makefile.in
+$FGREP quux.m4 Makefile.in

diff --git a/tests/acoutput2.test b/tests/acoutput2.test
index 6af5440d9398bc29d1b049fb0e2423800b396dfd..c2ea9c37789f76b81a901bc5b8b8b8374850996e 100755 (executable)
--- a/tests/acoutput2.test
+++ b/tests/acoutput2.test
@@ -20,7 +20,7 @@ mkdir subdir
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-count=`fgrep foo.in Makefile.in | wc -l`
+count=`$FGREP foo.in Makefile.in | wc -l`
 test $count -eq 2 || exit 1
 
 # This ought to work as well.

diff --git a/tests/all.test b/tests/all.test
index 2387dbe763b506308ef1b955ea832ffd1642e446..98c233d3377854e62faa2a7b17fca570ae5bbcb3 100755 (executable)
--- a/tests/all.test
+++ b/tests/all.test
@@ -11,6 +11,6 @@ for target in all install-exec install-data uninstall; do
    $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-   fgrep "${target}-local ${target}-local" Makefile.in && exit 1
+   $FGREP "${target}-local ${target}-local" Makefile.in && exit 1
 done
 exit 0

diff --git a/tests/ansi.test b/tests/ansi.test
index 3b7da79e06842ef282369504e7ca2b4bb206a494..81b40f90b42e38c4125a00558469f3d225507f9a 100755 (executable)
--- a/tests/ansi.test
+++ b/tests/ansi.test
@@ -21,5 +21,5 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
 $MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep 'ansi2knr\.c'

diff --git a/tests/ansi4.test b/tests/ansi4.test
index ac03bbf560c0b8f9256ae27907db45ab97c954d3..7c4afea0addce0f66a68e79b046dde813fd678b5 100755 (executable)
--- a/tests/ansi4.test
+++ b/tests/ansi4.test
@@ -24,4 +24,4 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'ansi2knr.$(' Makefile.in || exit 1
+$FGREP 'ansi2knr.$(' Makefile.in || exit 1

diff --git a/tests/colon3.test b/tests/colon3.test
index 3e5d6b7c85368f06ea4b2ce2187461757cfc07ca..630e99241d3848f9107442d24bf7bda4186b332a 100755 (executable)
--- a/tests/colon3.test
+++ b/tests/colon3.test
@@ -26,8 +26,8 @@ test -f zardoz.in || exit 1
 # never just "zardoz" -- except the actual automake invocation can
 # refer to it (don't ask).
 echo Grep1
-grep zardoz zardoz.in | fgrep -v 'zardoz.in' | fgrep -v 'zardoz.am' \
-   | fgrep -v AUTOMAKE > O
+grep zardoz zardoz.in | $FGREP -v 'zardoz.in' | $FGREP -v 'zardoz.am' \
+   | $FGREP -v AUTOMAKE > O
 # We cat the output file so we see in when verbose.
 cat O
 test -z "`cat O`" || exit 1

diff --git a/tests/cond21.test b/tests/cond21.test
index 05b07c7b177871437ef95a9355e32b53f4fbd0ac..32d641df09c8cbc14f546e018ac93b1573b40ea7 100755 (executable)
--- a/tests/cond21.test
+++ b/tests/cond21.test
@@ -61,5 +61,5 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 ./configure
-$MAKE test | fgrep 'BAR: bar12 bar bar3 :BAR'
-$MAKE test | fgrep 'FOO: foo foo1 foo1b foo2 :FOO'
+$MAKE test | $FGREP 'BAR: bar12 bar bar3 :BAR'
+$MAKE test | $FGREP 'FOO: foo foo1 foo1b foo2 :FOO'

diff --git a/tests/condlib.test b/tests/condlib.test
index e64062f289b5251002ac53956b8ce03c9b67fb8f..3ba6f03abc04a4c7aa02bc9b84b07d2c70d4d3e8 100755 (executable)
--- a/tests/condlib.test
+++ b/tests/condlib.test
@@ -24,5 +24,5 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep librsaref.a.c Makefile.in && exit 1
+$FGREP librsaref.a.c Makefile.in && exit 1
 exit 0

diff --git a/tests/confh4.test b/tests/confh4.test
index 4837ea5951b34b1b6e075eb18e8ee57d09406db0..06280af88944cb7eb5fb358bb1703f9738387a81 100755 (executable)
--- a/tests/confh4.test
+++ b/tests/confh4.test
@@ -27,4 +27,4 @@ mkdir include
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-egrep '^DEFAULT_INCLUDES =.* -I(\.|\$\(top_builddir\))/include' Makefile.in
+$EGREP '^DEFAULT_INCLUDES =.* -I(\.|\$\(top_builddir\))/include' Makefile.in

diff --git a/tests/confsub.test b/tests/confsub.test
index 3007c2da720db07477818134ed994a2f32954bef..423a0d3cc8de64ed4e7fcac34dc6077582a0b5cb 100755 (executable)
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -29,16 +29,16 @@ $AUTOMAKE || exit 1
 # One line is allowed though:
 #
 # cd $(top_builddir) && $(SHELL) ./config.status subdir/config.h
-(fgrep 'subdir/config.h' subdir/Makefile.in |
-   fgrep -v 'cd $(top_builddir)') && exit 1
+($FGREP 'subdir/config.h' subdir/Makefile.in |
+   $FGREP -v 'cd $(top_builddir)') && exit 1
 
 $AUTOCONF || exit 1
 ./configure || exit 1
-fgrep 'Before.' subdir/config.h
+$FGREP 'Before.' subdir/config.h
 
 sleep 2
 echo 'After.' > subdir/config.hin
 $MAKE || exit 1
-fgrep 'After.' subdir/config.h || exit 1
+$FGREP 'After.' subdir/config.h || exit 1
 
 exit 0

diff --git a/tests/cxxansi.test b/tests/cxxansi.test
index 1b43d5e387e611b37f497c360a90bcb361cd5129..b31baa942671346cd52ca4e3c9c9f0695ea90a26 100755 (executable)
--- a/tests/cxxansi.test
+++ b/tests/cxxansi.test
@@ -25,7 +25,7 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'jane$U' Makefile.in && exit 1
-fgrep 'doe$U' Makefile.in || exit 1
+$FGREP 'jane$U' Makefile.in && exit 1
+$FGREP 'doe$U' Makefile.in || exit 1
 
 exit 0

diff --git a/tests/cxxo.test b/tests/cxxo.test
index 8fe584b366e5eddb9c4655e14db8ce1ad95fe9f4..2f83621d14586ca48d39c7247f482e345232e473 100755 (executable)
--- a/tests/cxxo.test
+++ b/tests/cxxo.test
@@ -17,4 +17,4 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'doe.$(OBJEXT)' Makefile.in
+$FGREP 'doe.$(OBJEXT)' Makefile.in

diff --git a/tests/depend4.test b/tests/depend4.test
index da56d6b7c949b828c614981aa2e41be7614cac30..55ff3bf8b35c6671b0d453bc54052f087978a964 100755 (executable)
--- a/tests/depend4.test
+++ b/tests/depend4.test
@@ -19,7 +19,7 @@ END
 
     $AUTOMAKE || exit 1
 
-    egrep '^(@[^@]+@)*DEP_FILES = ' Makefile.in || exit 1
+    $EGREP '^(@[^@]+@)*DEP_FILES = ' Makefile.in || exit 1
 done
 
 exit 0

diff --git a/tests/discover.test b/tests/discover.test
index 37052b73c00012766dc4e57770171ade6855b600..ccb2114eeb27f6c6d174d1e308abf8d1135768b2 100755 (executable)
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -20,5 +20,5 @@ END
 : > fsusage.c
 
 $ACLOCAL || exit 1
-$AUTOMAKE 2>&1 | fgrep fsusage.c || exit 1
+$AUTOMAKE 2>&1 | $FGREP fsusage.c || exit 1
 exit 0

diff --git a/tests/distname.test b/tests/distname.test
index 3b3b27fa09a6eca4a55b07997c0f3917277bbc86..93450609361176ba8f436783c295c1db64bd5caf 100755 (executable)
--- a/tests/distname.test
+++ b/tests/distname.test
@@ -29,5 +29,5 @@ $AUTOMAKE --include-deps --copy --add-missing
 $MAKE dist
 
 gunzip nonesuch-0.23.tar.gz
-(tar tf nonesuch-0.23.tar | fgrep './nonesuch-0.23/a.c') && exit 1
+(tar tf nonesuch-0.23.tar | $FGREP './nonesuch-0.23/a.c') && exit 1
 exit 0

diff --git a/tests/dup3.test b/tests/dup3.test
index e0c831e60771f671db6d7ecb1f2134b46e38f150..8afd685961ccba52f44a9ad166b5bd06ae8ab98c 100755 (executable)
--- a/tests/dup3.test
+++ b/tests/dup3.test
@@ -17,4 +17,4 @@ END
 # Strip all options from ACLOCAL, especially -I's.
 ACLOCAL="`echo $ACLOCAL | sed -e 's/ -.*$//'` --acdir=$testsrcdir/../m4"
 $ACLOCAL -I zoo || exit 1
-fgrep zardoz aclocal.m4
+$FGREP zardoz aclocal.m4

diff --git a/tests/empty4.test b/tests/empty4.test
index 0ed85da088ef0e0dd53137e58d40898027bcbf42..054a176402b9ad8bee1ffb52c26c0e50a7bde5e1 100755 (executable)
--- a/tests/empty4.test
+++ b/tests/empty4.test
@@ -20,5 +20,5 @@ END
 
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
-fgrep zoo. Makefile.in && exit 1
+$FGREP zoo. Makefile.in && exit 1
 exit 0

diff --git a/tests/fo.test b/tests/fo.test
index 3c76e08ca5e994c34bfc7abfc30727f7adf1cdaf..f9429a387f23d6d0e98e14702cfc619e9c54aba5 100755 (executable)
--- a/tests/fo.test
+++ b/tests/fo.test
@@ -19,4 +19,4 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'doe.$(OBJEXT)' Makefile.in
+$FGREP 'doe.$(OBJEXT)' Makefile.in

diff --git a/tests/implicit.test b/tests/implicit.test
index d2bb72f3205a638477869038a2420af547f21492..d421f1316064de180554e777d73070b86ad0b62e 100755 (executable)
--- a/tests/implicit.test
+++ b/tests/implicit.test
@@ -16,4 +16,4 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-grep '^libapp_1_OBJECTS' Makefile.in | fgrep '.$(OBJEXT)'
+grep '^libapp_1_OBJECTS' Makefile.in | $FGREP '.$(OBJEXT)'

diff --git a/tests/insh2.test b/tests/insh2.test
index 001050083bb19827718fe2e1366ca02b0561ddb3..0d1c9e4e624dbfe93a886039c7ac99cbe824279b 100755 (executable)
--- a/tests/insh2.test
+++ b/tests/insh2.test
@@ -13,5 +13,5 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
 $MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep install-sh

diff --git a/tests/interp.test b/tests/interp.test
index 7e21ba11cf14d404da8cc09c75aba5894776aafb..b3ec58b63ffcd8a32df8618fb8d3712aa443f73c 100755 (executable)
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -17,4 +17,4 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'z.$(OBJEXT)' Makefile.in
+$FGREP 'z.$(OBJEXT)' Makefile.in

diff --git a/tests/lex.test b/tests/lex.test
index 3ca4ec7c9d815658641a6173c5a09439959401a2..177982bed9647fe7b6532e7750f7ec49cd911cf7 100755 (executable)
--- a/tests/lex.test
+++ b/tests/lex.test
@@ -21,11 +21,11 @@ $AUTOMAKE || exit 1
 
 # Test to make sure that lex source generates correct target.
 
-fgrep '$(LEX)' Makefile.in || exit 1
+$FGREP '$(LEX)' Makefile.in || exit 1
 
 # Test to make sure that lex source generates correct clean rule.
 # From Ralf Corsepius.
 
-fgrep joel Makefile.in && exit 1
+$FGREP joel Makefile.in && exit 1
 
 exit 0

diff --git a/tests/lex3.test b/tests/lex3.test
index 9133b4a923e39c910928d3cad871c7675fec646d..f110ea3063fbda76f36065639976158cbbecc4df 100755 (executable)
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -66,4 +66,4 @@ $MAKE distcheck
 
 # foo.c must be shipped.
 gunzip am_lex_bug-0.1.1.tar.gz
-tar tf am_lex_bug-0.1.1.tar | fgrep foo.c
+tar tf am_lex_bug-0.1.1.tar | $FGREP foo.c

diff --git a/tests/lex4.test b/tests/lex4.test
index b40fc54fcf972cbc49c65d784f01eccb08b1ef4b..10c187545fd1f8be94aad1d9a50d68f3f987b4e3 100755 (executable)
--- a/tests/lex4.test
+++ b/tests/lex4.test
@@ -21,4 +21,4 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep joe.Po Makefile.in
+$FGREP joe.Po Makefile.in

diff --git a/tests/libobj5.test b/tests/libobj5.test
index 9af320d59a0f3a36bb56a1dd04476247fc1055f9..5bd028be949014554bad2ed50d02dbedcb40e5dc 100755 (executable)
--- a/tests/libobj5.test
+++ b/tests/libobj5.test
@@ -20,4 +20,4 @@ END
 
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
-fgrep foo.c Makefile.in
+$FGREP foo.c Makefile.in

diff --git a/tests/libobj7.test b/tests/libobj7.test
index 2c7ddf0f07108916c3918e287d20d5e782284735..11de68f9d95c9371733c532922e7d760941ff79f 100755 (executable)
--- a/tests/libobj7.test
+++ b/tests/libobj7.test
@@ -33,4 +33,4 @@ sed -n -e ': again
      n
      s/^/DIST_COMMON/
      b again
-  }' < Makefile.in | fgrep dirname.c
+  }' < Makefile.in | $FGREP dirname.c

diff --git a/tests/make.test b/tests/make.test
index 310cb176e1e12b63d94b3ec4af10496fb9a975b4..6cc511913a1399f101457b84bdea7f87840b359d 100755 (executable)
--- a/tests/make.test
+++ b/tests/make.test
@@ -33,12 +33,12 @@ save="$MAKE"
 for flag in '' -w; do
    MAKE="$save $flag" ./configure
 
-   fgrep 'am__include = include' Makefile
+   $FGREP 'am__include = include' Makefile
 
    touch configure.in
    $MAKE $flag
 
-   fgrep 'am__include = include' Makefile
+   $FGREP 'am__include = include' Makefile
 
    rm -f config.cache
 done

diff --git a/tests/makevars.test b/tests/makevars.test
index 323c843ed8d68dfa09b28816ae498563cd942335..f1c0d8bff2a72743ca13c5903c12dbd4f3ecacf2 100755 (executable)
--- a/tests/makevars.test
+++ b/tests/makevars.test
@@ -14,6 +14,6 @@ $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # We are definitely not needing a compiler or preprocessor.
-egrep '^(CC|CPP|CXX|CXXCPP) =' Makefile.in && exit 1
+$EGREP '^(CC|CPP|CXX|CXXCPP) =' Makefile.in && exit 1
 
 exit 0

diff --git a/tests/nostdinc.test b/tests/nostdinc.test
index 2faf1d2ac345fcea31239214c220e24340450bdf..d769ca7b33c3c342dd1d3e8ae36f838401c89db0 100755 (executable)
--- a/tests/nostdinc.test
+++ b/tests/nostdinc.test
@@ -17,5 +17,5 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep -e '-I.' Makefile.in && exit 1
+$FGREP -e '-I.' Makefile.in && exit 1
 exit 0

diff --git a/tests/parse.test b/tests/parse.test
index 76ca60b2566da0abd9a4d3f514c9ad2df3622fa1..5b65b72ac99548f633b94356d5907e833b998a5e 100755 (executable)
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -22,5 +22,5 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep zar.cdoz Makefile.in && exit 1
+$FGREP zar.cdoz Makefile.in && exit 1
 exit 0

diff --git a/tests/pluseq.test b/tests/pluseq.test
index f7673a4731c2ff6b2168663ddd865aa2f51ddecd..08189429ac9249a6c414bde9003b9b085b6d41fc 100755 (executable)
--- a/tests/pluseq.test
+++ b/tests/pluseq.test
@@ -14,4 +14,4 @@ END
 
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
-fgrep 'zar doz' Makefile.in
+$FGREP 'zar doz' Makefile.in

diff --git a/tests/pluseq4.test b/tests/pluseq4.test
index 5f8637faf77d323147f5e0bc23d3b02e79ebada3..ac8226808693e5dd9c4f0984200f4646ed2e0c06 100755 (executable)
--- a/tests/pluseq4.test
+++ b/tests/pluseq4.test
@@ -15,4 +15,4 @@ END
 
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
-fgrep '@CC@ -Dwhatever' Makefile.in
+$FGREP '@CC@ -Dwhatever' Makefile.in

diff --git a/tests/pluseq6.test b/tests/pluseq6.test
index ae8e869abbc4bf23f6046f3dfb8b3ce0a071c6d5..54b015f5094b01e4d84a1871de42e7a03870da37 100755 (executable)
--- a/tests/pluseq6.test
+++ b/tests/pluseq6.test
@@ -14,7 +14,7 @@ END
 
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
-fgrep '@mandir@ foo' Makefile.in || exit 1
+$FGREP '@mandir@ foo' Makefile.in || exit 1
 
 num=`grep '^mandir =' Makefile.in | wc -l`
 test $num -eq 1

diff --git a/tests/pr2.test b/tests/pr2.test
index c93be6d438436ac960f5d0f0a1b0df379ab53dcc..32c3949802de8322a4237ad9d1b84b68649802a3 100755 (executable)
--- a/tests/pr2.test
+++ b/tests/pr2.test
@@ -20,4 +20,4 @@ $AUTOMAKE || exit 1
 
 # Look for mkinstalldirs invocation for the templ directory.
 # We use the `[^/]' to avoid matching `templ/README.foo.in'.
-egrep 'mkinstalldirs.*templ([^/]|$)' Makefile.in
+$EGREP 'mkinstalldirs.*templ([^/]|$)' Makefile.in

diff --git a/tests/pr9.test b/tests/pr9.test
index afc4551869bdfe3ca3e41f8de26eea5c70e66431..5fa6abd86123e939cbbab1fa72ba2864ae21a80d 100755 (executable)
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -31,4 +31,4 @@ $MAKE distcheck || exit 1
 
 gunzip pr9-0.tar.gz || exit 1
 
-tar tf pr9-0.tar | fgrep support
+tar tf pr9-0.tar | $FGREP support

diff --git a/tests/seenc.test b/tests/seenc.test
index 544b020291c93442b0254b6182c53bf71cf40e22..d265f2996d84b2243ad7e079e2df985fe8166807 100755 (executable)
--- a/tests/seenc.test
+++ b/tests/seenc.test
@@ -24,5 +24,5 @@ $ACLOCAL || exit 1
 # output for this test, and we just want to make sure some of
 # them are about CC and CXX being undefined.
 $AUTOMAKE --Wno-error 2> err && exit 1
-fgrep CC err || exit 1
-fgrep CXX err || exit 1
+$FGREP CC err || exit 1
+$FGREP CXX err || exit 1

diff --git a/tests/specflags.test b/tests/specflags.test
index 2e03e74fa933c388b9a10d7ce8c9daccac8106f4..465280bc2ea49691418758142f5f70c16dfd6c99 100755 (executable)
--- a/tests/specflags.test
+++ b/tests/specflags.test
@@ -30,6 +30,6 @@ grep 'COMPILE. [^-]' Makefile.in && exit 1
 grep '[^-]foo\.o' Makefile.in && exit 1
 
 # Regression test for missing space.
-fgrep ')-c' Makefile.in && exit 1
+$FGREP ')-c' Makefile.in && exit 1
 
 exit 0

diff --git a/tests/specflags3.test b/tests/specflags3.test
index f6cdd116e589882117c118bb8059ae1381467068..a86026b4a30d7063a2178ceafde31678e99ae4dd 100755 (executable)
--- a/tests/specflags3.test
+++ b/tests/specflags3.test
@@ -23,11 +23,11 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep -e '-o foo-foo' Makefile.in || exit 1
+$FGREP -e '-o foo-foo' Makefile.in || exit 1
 
-fgrep 'foo.o.o' Makefile.in                       && exit 1
-fgrep 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in       && exit 1
+$FGREP 'foo.o.o' Makefile.in                       && exit 1
+$FGREP 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in       && exit 1
 
-fgrep '$(foo_CFLAGS)' Makefile.in || exit 1
+$FGREP '$(foo_CFLAGS)' Makefile.in || exit 1
 
 exit 0

diff --git a/tests/specflags6.test b/tests/specflags6.test
index cd94304afd291438c7b4294530504ea8bcbadfa1..ebf4a582e210bd5226c688ce31d52fdd788682ad 100755 (executable)
--- a/tests/specflags6.test
+++ b/tests/specflags6.test
@@ -26,7 +26,7 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-uncondval=`fgrep 'foo-foo.o: foo.c' Makefile.in`
+uncondval=`$FGREP 'foo-foo.o: foo.c' Makefile.in`
 
 cat >> Makefile.am << 'END'
 foo_SOURCES += $(BAR_SRCS)
@@ -34,6 +34,6 @@ END
 
 $AUTOMAKE || exit 1
 
-condval=`fgrep 'foo-foo.o: foo.c' Makefile.in`
+condval=`$FGREP 'foo-foo.o: foo.c' Makefile.in`
 
 test "x$uncondval" = "x$condval"

diff --git a/tests/subobj.test b/tests/subobj.test
index f9245b85793971bd3c3b2f7d1146be7fa122369d..9c33fd7eec7ba2ddb5018c356902059a4f03cefa 100755 (executable)
--- a/tests/subobj.test
+++ b/tests/subobj.test
@@ -20,7 +20,7 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'generic/a.$(OBJEXT)' Makefile.in || exit 1
+$FGREP 'generic/a.$(OBJEXT)' Makefile.in || exit 1
 grep '[^/]a\.\$(OBJEXT)' Makefile.in && exit 1
 
 # Opportunistically test for a different bug.

diff --git a/tests/subobj2.test b/tests/subobj2.test
index 2d46f2f1e0569b23474ac454b07599a6e252dc3c..4a4bbf82a362987be2f58178aa5e7e30acbb5b07 100755 (executable)
--- a/tests/subobj2.test
+++ b/tests/subobj2.test
@@ -19,6 +19,6 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'generic/a.$(OBJEXT)' Makefile.in || exit 1
+$FGREP 'generic/a.$(OBJEXT)' Makefile.in || exit 1
 grep '[^/]a\.\$(OBJEXT)' Makefile.in && exit 1
-fgrep -e '-c -o' Makefile.in
+$FGREP -e '-c -o' Makefile.in

diff --git a/tests/suffix3.test b/tests/suffix3.test
index 31c910c67321bd0cb6ebe893ce56d2d02ab31ad4..277658a33badf0df421a3d722bf34833661308f9 100755 (executable)
--- a/tests/suffix3.test
+++ b/tests/suffix3.test
@@ -21,8 +21,8 @@ $AUTOMAKE || exit 1
 
 # The foo.cc intermediate step is implicit, it's a mistake if
 # Automake requires this file somewhere.
-fgrep foo.cc Makefile.in && exit 1
+$FGREP foo.cc Makefile.in && exit 1
 # However Automake must figure that foo.zoo is eventually
 # transformed into foo.o, and use this latter file (to link foo).
-fgrep 'foo.$(OBJEXT)' Makefile.in || exit 1
+$FGREP 'foo.$(OBJEXT)' Makefile.in || exit 1
 exit 0

diff --git a/tests/texinfo.test b/tests/texinfo.test
index 3ade532305ddf799866be24cba998f2924945413..c05e9021935fe1b7a18b474efe3c6d2f2da0f658 100755 (executable)
--- a/tests/texinfo.test
+++ b/tests/texinfo.test
@@ -17,5 +17,5 @@ echo '@setfilename textutils.info' > textutils.texi
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
 $MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep 'texinfo\.tex'

diff --git a/tests/texinfo6.test b/tests/texinfo6.test
index 6df7556290e4acb0cc3457c77704fffbe2525390..1cf03f5d9a87e0ac9afe089e03afc462caed9bac 100755 (executable)
--- a/tests/texinfo6.test
+++ b/tests/texinfo6.test
@@ -13,4 +13,4 @@ echo '@setfilename foo.info' > foo.txi
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep '.txi.info' Makefile.in
+$FGREP '.txi.info' Makefile.in

diff --git a/tests/texinfo8.test b/tests/texinfo8.test
index 98cfdbe205b23feff8309d636d86a7f356cb7894..3d24e645912d2846789de6367350935d4d08839b 100755 (executable)
--- a/tests/texinfo8.test
+++ b/tests/texinfo8.test
@@ -29,7 +29,7 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE -a || exit 1
 
-fgrep -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed
+$FGREP -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed
 test -f sub/texinfo.tex &&
 $MAKE -s -f sub/Makefile.sed SHELL=/bin/sh magic | grep 'texinfo\.tex'
 stat=$?

diff --git a/tests/vtexi.test b/tests/vtexi.test
index b996360979d8f3a29277dfc812582f3cdb2529aa..b837ba98a35883e3a171853f5c12b5ff0f47e31f 100755 (executable)
--- a/tests/vtexi.test
+++ b/tests/vtexi.test
@@ -34,8 +34,8 @@ grep '^textutils\.info: textutils\.texi .*version\.texi$' Makefile.in
 # When running the first version of configure.ac aware automake,
 # @CONFIGURE_AC@ was not properly substitued.
 
-egrep '^\$\(srcdir\)/stamp-vti:.*textutils\.texi( .*)?$' Makefile.in
-egrep '^\$\(srcdir\)/stamp-vti:.*\$\(top_srcdir\)/configure\.in( .*)?$' Makefile.in
+$EGREP '^\$\(srcdir\)/stamp-vti:.*textutils\.texi( .*)?$' Makefile.in
+$EGREP '^\$\(srcdir\)/stamp-vti:.*\$\(top_srcdir\)/configure\.in( .*)?$' Makefile.in
 
 
 # Check that the path to mdate-sh is correct.  Over escaping of `$'

diff --git a/tests/yacc3.test b/tests/yacc3.test
index dbd61ec868f5e8d0fc0f61f697aa40c7677d983a..07f652474e27a760dd14777844e30f880c4eb0d3 100755 (executable)
--- a/tests/yacc3.test
+++ b/tests/yacc3.test
@@ -21,7 +21,7 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
 # It should not be disted here
 grep 'zardoz.h' Makefile.in && exit 1
 

diff --git a/tests/yacc6.test b/tests/yacc6.test
index b89467643a332110fea7b353aeaea865d6a7ce6a..e17e01447eda893c6c4e9cc5340f6035977e7584 100755 (executable)
--- a/tests/yacc6.test
+++ b/tests/yacc6.test
@@ -30,5 +30,5 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE -a || exit 1
 test -f ylwrap || exit 1
-fgrep '(srcdir)/ylwrap' sub/Makefile.in && exit 1
+$FGREP '(srcdir)/ylwrap' sub/Makefile.in && exit 1
 exit 0