[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.0b-10-g423105a

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=423105aa0f9db7b6979e99d1a096dda03b2983d6

The branch, maint has been updated
       via  423105aa0f9db7b6979e99d1a096dda03b2983d6 (commit)
      from  9a7a83ba81789eddcd0aece24c079bac1116c8c1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 423105aa0f9db7b6979e99d1a096dda03b2983d6
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jun 1 12:37:41 2012 +0200

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 t/cscope.tap |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/t/cscope.tap b/t/cscope.tap
index c39feed..dbc4993 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
 


hooks/post-receive
-- 
GNU Automake