From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sat, 30 Nov 2002 20:41:11 +0000 (+0000)
Subject: * tests/gnits2.test, tests/gnits3.test: Move the greps inside the
X-Git-Tag: Release-1-7b~352
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=ca72e0265b3c1d42e641e21d8d44258775cf3d0f;p=automake.git

* 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 a246c2d8..a92a06eb 100644
--- 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 6ab6dbf3..e3484f92 100755
--- 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 b492686d..d1cf671f 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 ..