From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 1 Jun 2012 10:37:41 +0000 (+0200)
Subject: tests: avoid spurious failures with Solaris 9 cscope program
X-Git-Tag: v1.12.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=423105aa0f9db7b6979e99d1a096dda03b2983d6;p=thirdparty%2Fautomake.git

tests: avoid spurious failures with Solaris 9 cscope program

* t/cscope.tap: Also check that the cscope program in use supports the
'-q' option; if this is not the case, some cscope usages in the generated
Makefiles would fail, so we must skip the checks involving those usages.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/t/cscope.tap b/t/cscope.tap
index c39feedd7..dbc499375 100755
--- a/t/cscope.tap
+++ b/t/cscope.tap
@@ -65,8 +65,9 @@ $ACLOCAL || fatal_ "aclocal failed"
 $AUTOCONF || fatal_ "autoconf failed"
 $AUTOMAKE -i -a || fatal_ "automake -i -a failed"
 
-# Sun cscope is interactive without redirection.
-if cscope --version </dev/null; then
+# Sun cscope is interactive without redirection; also, it might not
+# support the '-q' option, which is required by our generated recipes.
+if cscope -q --version </dev/null; then
   have_cscope=yes
 else
   have_cscope=no
@@ -99,7 +100,7 @@ test_cscope ()
   if test $have_cscope = no; then
     # For later tests.
     touch cscope.files cscope.out cscope.in.out cscope.po.out
-    skip_row_ 3 -r "no cscope program avaiable"
+    skip_row_ 3 -r "no proper cscope program available"
     return 0
   fi