* tests/defs (xsi-bin-sh, xsi-shell): Remove these requirements, they have never been used. (cygpath, cscope): Recognizing these explicitly is mostly redundant; just merge them with the default "catch all" rule, and adjust that accordingly. (bzip2): Adjust some outdated comments. --- tests/defs | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/tests/defs b/tests/defs index 14648f5..565df73 100644 --- a/tests/defs +++ b/tests/defs @@ -735,10 +735,6 @@ do :) ;; cc|c++|fortran|fortran77) require_compiler_ $tool;; - xsi-shell) - require_xsi "$SHELL";; - xsi-bin-sh) - require_xsi "/bin/sh";; xsi-lib-shell) if test x"$am_test_prefer_config_shell" = x"yes"; then require_xsi "$SHELL" @@ -747,7 +743,8 @@ do fi ;; bzip2) - # Do not use --version, bzip2 still tries to compress stdin. + # Do not use --version, older versions bzip2 still tries to compress + # stdin. echo "$me: running bzip2 --help" bzip2 --help \ || skip_all_ "required program 'bzip2' not available" @@ -762,16 +759,6 @@ do echo "$me: running $CC -?" $CC -? || skip_all_ "Microsoft C compiler '$CC' not available" ;; - cscope) - # Sun cscope is interactive without redirection. - echo "$me: running cscope --version </dev/null" - cscope --version </dev/null \ - || skip_all_ "required program 'cscope' not available" - ;; - cygpath) - echo "$me: running cygpath --version" - cygpath --version || skip_all_ "cygpath not available" - ;; etags) # Exuberant Ctags will create a TAGS file even # when asked for --help or --version. (Emacs's etags @@ -961,9 +948,11 @@ do # Generic case: the tool must support --version. echo "$me: running $tool --version" # It is not likely but possible that $tool is a special builtin, - # in which case the shell is allowed to exit after an error. - # So, please leave the subshell here. - ($tool --version) || skip_all_ "required program '$tool' not available" + # in which case the shell is allowed to exit after an error. So + # we need the subshell here. Also, some tools, like Sun cscope, + # can be interactive without redirection. + ($tool --version) </dev/null \ + || skip_all_ "required program '$tool' not available" ;; esac done -- 1.7.9