diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-01 12:37:41 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-01 12:37:41 +0200 |
commit | 423105aa0f9db7b6979e99d1a096dda03b2983d6 (patch) | |
tree | 62ce453f0f3af4b9f336c9e6c661730b0f21f6a3 | |
parent | 9a7a83ba81789eddcd0aece24c079bac1116c8c1 (diff) | |
download | automake-423105aa0f9db7b6979e99d1a096dda03b2983d6.tar.gz |
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>
-rwxr-xr-x | t/cscope.tap | 7 |
1 files changed, 4 insertions, 3 deletions
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 |