* 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.

diff --git a/ChangeLog b/ChangeLog
index a246c2d8399af18ac93bc0d3623e4275ad0506d7..a92a06eb23258ce20b0dfba608fc02ad1e8fce36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-11-30  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * 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.
+
        For PR automake/375 (Debian Bug #168671):
        * automake.in (scan_texinfo_file): Erase all known index files, no
        matter whether they are used at the top-level or not, because we

diff --git a/tests/gnits2.test b/tests/gnits2.test
index 6ab6dbf35fb9a86af3f3cd8a698197d9be4b7b87..e3484f92b8715b925eae3968668ed0d4f52743cd 100755 (executable)
--- a/tests/gnits2.test
+++ b/tests/gnits2.test
@@ -38,6 +38,14 @@ fubar2_SOURCES = fubar.c
 sub_fubar3_SOURCES = fubar.c
 sub_fine_SOURCES = fine.c
 bin_SCRIPTS = sub/scriptok.sh sub/scriptnok.sh
+
+grep-stderr:
+       grep 'pfubar$(EXEEXT) does not support' stderr
+       grep 'pfubar3$(EXEEXT) does not support' stderr
+       grep 'pscriptnok.sh does not support' stderr
+## Only three failures please.
+       test `grep 'does not support --help' stderr | wc -l` = 3
+       test `grep 'does not support --version' stderr | wc -l` = 3
 END
 
 echo 'int main () { return 0; }' > fubar.c
@@ -93,9 +101,4 @@ test -f ../inst-dir/bin/pfine
 test ! -f ../inst-dir/bin/fine
 $MAKE -k installcheck 2>stderr || : # Never trust the exit status of make -k.
 cat stderr
-grep 'pfubar does not support' stderr
-grep 'pfubar3 does not support' stderr
-grep 'pscriptnok.sh does not support' stderr
-# Only three failures please.
-test `grep 'does not support --help' stderr | wc -l` = 3
-test `grep 'does not support --version' stderr | wc -l` = 3
+$MAKE grep-stderr

diff --git a/tests/gnits3.test b/tests/gnits3.test
index b492686d62e9f3222ff2fe3e7035be4c64a1967a..d1cf671f377389beeca500cbf520dc63d723d526 100755 (executable)
--- 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 ..