* tests/gnits2.test, tests/gnits3.test: Move the greps inside the

Makefile, so we can honor $(EXEEXT).  Otherwise these tests
fail under Cygwin.
Reported by Charles Wilson.

1 files changed, 8 insertions, 6 deletions

diff --git a/tests/gnits3.test b/tests/gnits3.test
index b492686d6..d1cf671f3 100755
--- a/tests/gnits3.test
+++ b/tests/gnits3.test
@@ -41,6 +41,13 @@ sub_nok_SOURCES = nok.c
 nobase_bin_SCRIPTS = nok.sh sub/nok.sh
 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = nok nok.sh
+
+grep-stderr:
+	grep 'sub/pnok$(EXEEXT) does not support' stderr
+	grep 'sub/pnok.sh does not support' stderr
+## Only two failures please.
+	test `grep 'does not support --help' stderr | wc -l` = 2
+	test `grep 'does not support --version' stderr | wc -l` = 2
 END
 
 echo 'int main () { return 0; }' > nok.c
@@ -82,12 +89,7 @@ $MAKE
 $MAKE install
 $MAKE -k installcheck 2>stderr || : # Never trust the exit status of make -k.
 cat stderr
-grep 'sub/pnok does not support' stderr
-grep 'sub/pnok.sh does not support' stderr
-# Only two failures please.
-test `grep 'does not support --help' stderr | wc -l` = 2
-test `grep 'does not support --version' stderr | wc -l` = 2
-
+$MAKE grep-stderr
 
 # Make sure there is no more error when all targets are exempted.
 cd ..