[FYI] {tap-testsuite-protocols} test defs: fix skip directives to work also with TAP-based tests

[Stefano Lattarini]

* test/defs: Use `skip_all_', not `skip_', to issue a skip of the
whole calling test script.
---
 ChangeLog  |    6 ++++
 tests/defs |   86 ++++++++++++++++++++++++++++++------------------------------
 2 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d2f5da..55179a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-08-08  Stefano Lattarini  <address@hidden>
 
+       test defs: fix skip directives to work also with TAP-based tests
+       * test/defs: Use `skip_all_', not `skip_', to issue a skip of the
+       whole calling test script.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
        test defs: more environment cleanup
        * tests/defs: Also unset variables AM_COLOR_TESTS and
        AM_TESTS_ENVIRONMENT.
diff --git a/tests/defs b/tests/defs
index 2778972..d3ae1dd 100644
--- a/tests/defs
+++ b/tests/defs
@@ -428,7 +428,7 @@ require_xsi ()
 {
   test $# -eq 1 || fatal_ "require_xsi needs exactly one argument"
   echo "$me: trying some XSI constructs with $1"
-  $1 -c "$xsi_shell_code" || skip_ "$1 lacks XSI features"
+  $1 -c "$xsi_shell_code" || skip_all_ "$1 lacks XSI features"
 }
 # Shell code supposed to work only with XSI shells.  Keep this in sync
 # with libtool.m4:_LT_CHECK_SHELL_FEATURES.
@@ -470,13 +470,13 @@ do
   case $tool in
     :) ;;
     cc)
-      test "$CC"  = false && skip_ "no C compiler available";;
+      test "$CC"  = false && skip_all_ "no C compiler available";;
     c++)
-      test "$CXX" = false && skip_ "no C++ compiler available";;
+      test "$CXX" = false && skip_all_ "no C++ compiler available";;
     fortran)
-      test "$FC"  = false && skip_ "no Fortran compiler available";;
+      test "$FC"  = false && skip_all_ "no Fortran compiler available";;
     fortran77)
-      test "$F77" = false && skip_ "no Fortran 77 compiler available";;
+      test "$F77" = false && skip_all_ "no Fortran 77 compiler available";;
     xsi-shell)
       require_xsi "$SHELL";;
     xsi-bin-sh)
@@ -492,19 +492,19 @@ do
       # Do not use --version, bzip2 still tries to compress stdin.
       echo "$me: running bzip2 --help"
       bzip2 --help \
-        || skip_ "required program \`bzip2' not available"
+        || skip_all_ "required program \`bzip2' not available"
       ;;
     cl)
       CC=cl
       export CC
       echo "$me: running $CC -?"
-      $CC -? || skip_ "Microsoft C compiler \`$CC' not available"
+      $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_ "required program \`cscope' not available"
+        || skip_all_ "required program \`cscope' not available"
       ;;
     etags)
       # Exuberant Ctags will create a TAGS file even
@@ -513,7 +513,7 @@ do
       # to make sure we do not pollute the tests/ directory.
       echo "$me: running etags --version -o /dev/null"
       etags --version -o /dev/null \
-        || skip_ "required program \`etags' not available"
+        || skip_all_ "required program \`etags' not available"
       ;;
     GNUmake)
       for make_ in "$MAKE" gmake gnumake :; do
@@ -522,7 +522,7 @@ do
         echo "$me: determine whether $MAKE is GNU make"
         using_gmake && break
       done
-      test "$MAKE" = : && skip_ "this test requires GNU make"
+      test "$MAKE" = : && skip_all_ "this test requires GNU make"
       export MAKE
       unset make_
       ;;
@@ -534,33 +534,33 @@ do
       CC=${am__tool_prefix}gcc
       export CC
       echo "$me: running $CC --version"
-      $CC --version || skip_ "GNU C compiler not available"
+      $CC --version || skip_all_ "GNU C compiler not available"
       echo "$me: running $CC -v"
-      $CC -v || skip_ "botched installation for GNU C compiler"
+      $CC -v || skip_all_ "botched installation for GNU C compiler"
       ;;
     gcj)
       GCJ=${am__tool_prefix}gcj
       export GCJ
       echo "$me: running $GCJ --version"
-      $GCJ --version || skip_ "GNU Java compiler not available"
+      $GCJ --version || skip_all_ "GNU Java compiler not available"
       echo "$me: running $GCJ -v"
-      $GCJ -v || skip_ "botched installation for GNU Java compiler"
+      $GCJ -v || skip_all_ "botched installation for GNU Java compiler"
       ;;
     g++)
       CXX=${am__tool_prefix}g++
       export CXX
       echo "$me: running $CXX --version"
-      $CXX --version || skip_ "GNU C++ compiler not available"
+      $CXX --version || skip_all_ "GNU C++ compiler not available"
       echo "$me: running $CXX -v"
-      $CXX -v || skip_ "botched installation for GNU C++ compiler"
+      $CXX -v || skip_all_ "botched installation for GNU C++ compiler"
       ;;
     gfortran)
       FC=${am__tool_prefix}gfortran
       export FC
       echo "$me: running $FC --version"
-      $FC --version || skip_ "GNU Fortran compiler not available"
+      $FC --version || skip_all_ "GNU Fortran compiler not available"
       echo "$me: running $FC -v"
-      $FC -v || skip_ "botched installation for GNU Fortran compiler"
+      $FC -v || skip_all_ "botched installation for GNU Fortran compiler"
       case " $required " in
         *\ g77\ *) ;;
         *) F77=$FC; export F77;;
@@ -570,9 +570,9 @@ do
       F77=${am__tool_prefix}g77
       export F77
       echo "$me: running $F77 --version"
-      $F77 --version || skip_ "GNU Fortran 77 compiler not available"
+      $F77 --version || skip_all_ "GNU Fortran 77 compiler not available"
       echo "$me: running $F77 -v"
-      $F77 -v || skip_ "botched installation for GNU Fortran 77 compiler"
+      $F77 -v || skip_all_ "botched installation for GNU Fortran 77 compiler"
       case " $required " in
         *\ gfortran\ *) ;;
         *) FC=$F77; export FC;;
@@ -586,7 +586,7 @@ do
       # it will try link *nothing* and complain it cannot find
       # main(); funny).  Use -help so it does not try linking anything.
       echo "$me: running $CC -V -help"
-      $CC -V -help || skip_ "Intel C compiler \`$CC' not available"
+      $CC -V -help || skip_all_ "Intel C compiler \`$CC' not available"
       ;;
     javac)
       # The Java compiler from JDK 1.5 (and presumably earlier versions)
@@ -594,18 +594,18 @@ do
       # telling that source files are missing.  Adding also the `-help'
       # option seems to solve the problem.
       echo "$me: running javac -version -help"
-      javac -version -help || skip_ "Sun Java compiler not available"
+      javac -version -help || skip_all_ "Sun Java compiler not available"
       ;;
     makedepend)
       echo "$me: running makedepend -f-"
       makedepend -f- \
-        || skip_ "required program \`makedepend' not available"
+        || skip_all_ "required program \`makedepend' not available"
       ;;
     makeinfo-html)
       # Make sure we have makeinfo, and it understands `--html'.
       echo "$me: running makeinfo --html --version"
       makeinfo --html --version \
-        || skip_ "cannot find a makeinfo program that groks the" \
+        || skip_all_ "cannot find a makeinfo program that groks the" \
                  "\`--html' option"
       ;;
     non-root)
@@ -618,22 +618,22 @@ do
       overwrite_status=$?
       rm -f $priv_check_temp
       if test $overwrite_status -eq 0; then
-        skip_ "cannot drop file write permissions"
+        skip_all_ "cannot drop file write permissions"
       fi
       unset priv_check_temp overwrite_status
       ;;
     perl-threads)
       if test "$WANT_NO_THREADS" = "yes"; then
-        skip_ "Devel::Cover cannot cope with threads"
+        skip_all_ "Devel::Cover cannot cope with threads"
       fi
       ;;
     native)
-      cross_compiling && skip_ "doesn't work in cross-compile mode"
+      cross_compiling && skip_all_ "doesn't work in cross-compile mode"
       ;;
     python)
       # Python doesn't support --version, it has -V
       echo "$me: running python -V"
-      python -V || skip_ "python interpreter not available"
+      python -V || skip_all_ "python interpreter not available"
       ;;
     ro-dir)
       # Skip this test case if read-only directories aren't supported
@@ -645,7 +645,7 @@ do
       create_status=$?
       rm -rf $ro_dir_temp
       if test $create_status -eq 0; then
-        skip_ "cannot drop directory write permissions"
+        skip_all_ "cannot drop directory write permissions"
       fi
       unset ro_dir_temp create_status
       ;;
@@ -656,7 +656,7 @@ do
           echo "$me: running $r2h --version"
           $r2h --version && break 2
         done
-        skip_ "no proper rst2html program found"
+        skip_all_ "no proper rst2html program found"
       done
       unset r2h
       ;;
@@ -666,30 +666,30 @@ do
       # DejaGnu 1.4.3 or later.
       echo "$me: running runtest SOMEPROGRAM=someprogram --version"
       runtest SOMEPROGRAM=someprogram --version \
-        || skip_ "DejaGnu is not available"
+        || skip_all_ "DejaGnu is not available"
       ;;
     tex)
       # No all versions of Tex support `--version', so we use
       # a configure check.
       if test -z "$TEX"; then
-        skip_ "TeX is required, but it wasn't found by configure"
+        skip_all_ "TeX is required, but it wasn't found by configure"
       fi
       ;;
     texi2dvi-o)
       # Texi2dvi supports `-o' since Texinfo 4.1.
       echo "$me: running texi2dvi -o /dev/null --version"
       texi2dvi -o /dev/null --version \
-        || skip_ "required program \`texi2dvi' not available"
+        || skip_all_ "required program \`texi2dvi' not available"
       ;;
     flex)
       # Since flex is required, we pick LEX for ./configure.
       LEX=flex
       export LEX
       echo "$me: running flex --version"
-      flex --version || skip_ "required program \`flex' not available"
+      flex --version || skip_all_ "required program \`flex' not available"
       ;;
     lex)
-      test "$LEX" = false && skip_ "no Lex program available"
+      test "$LEX" = false && skip_all_ "no Lex program available"
       if test -z "$LEX"; then
         # The user hasn't explicitly specified any lex program in the
         # environment, so we try to use flex, skipping the test if it's
@@ -697,11 +697,11 @@ do
         LEX=flex
         export LEX
         echo "$me: running flex --version"
-        flex --version || skip_ "required program \`flex' not available"
+        flex --version || skip_all_ "required program \`flex' not available"
       fi
       ;;
     yacc)
-      test "$YACC" = false && skip_ "no Yacc program available"
+      test "$YACC" = false && skip_all_ "no Yacc program available"
       if test -z "$YACC"; then
         # The user hasn't explicitly specified any yacc program in the
         # environment, so we try to use bison, skipping the test if it's
@@ -709,7 +709,7 @@ do
         YACC='bison -y'
         export YACC
         echo "$me: running bison --version"
-        bison --version || skip_ "required program \`bison' not available"
+        bison --version || skip_all_ "required program \`bison' not available"
       fi
       ;;
     *)
@@ -718,7 +718,7 @@ do
       # 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_ "required program \`$tool' not available"
+      ($tool --version) || skip_all_ "required program \`$tool' not available"
       ;;
   esac
 done
@@ -730,7 +730,7 @@ case $testbuilddir in
   *\ *|*\      *)
     case " $required " in
       *' libtool '* | *' libtoolize '* )
-        skip_ "libtool has problems with spaces in builddir name";;
+        skip_all_ "libtool has problems with spaces in builddir name";;
     esac
     ;;
 esac
@@ -743,7 +743,7 @@ case $testsrcdir in
   *\ * |*\     *)
     case " $required " in
       *' libtool '* | *' libtoolize '* | *' gettext '* )
-        skip_ "spaces in srcdir name: libtool/gettext tests won't work";;
+        skip_all_ "spaces in srcdir name: libtool/gettext tests won't work";;
    esac
    ;;
 esac
@@ -783,7 +783,7 @@ case " $required " in
           # Write more diagnostic to the log file than to the console.
           echo "$me: \`libtool.m4' wasn't found in directories" \
                "$aclocaldir $extra_includes"
-          skip_ "libtool m4 macros won't be found by aclocal"
+          skip_all_ "libtool m4 macros won't be found by aclocal"
         fi
         ;;
       *' gettext '*)
@@ -791,7 +791,7 @@ case " $required " in
           # Write more diagnostic to the log file than to the console.
           echo "$me: \`gettext.m4' wasn't found in directories" \
                "$aclocaldir $extra_includes"
-          skip_ "gettext m4 macros won't be found by aclocal"
+          skip_all_ "gettext m4 macros won't be found by aclocal"
         fi
         ;;
     esac
-- 
1.7.2.3