kc3-lang/automake/t/tap-diagnostic-custom.sh

• Show log

  Commit

• Hash : c2a52bf0
  Author :
  Date : 2012-06-24T10:36:15
  

  tests: simpler workaround for shells losing the exit status in exit trap
  
  Now that we can assume our tests are run by a decent POSIX shell, we
  can simplify our workaround aimed at having the exit status propagated
  correctly to the code in the exit trap.  Unfortunately, we cannot
  dispense with such a workaround altogether, because it's still required
  by some shells we need to support (at least Solaris 10 /bin/ksh and
  /usr/xpg4/bin/sh).
  
  For more information about the need of that workaround, see the entry
  about 'trap' in the section "Limitations of Shell Builtins" in the
  Autoconf manual:
  <http://www.gnu.org/software/autoconf/manual/autoconf.html#trap>
  
  The new workaround has been tested successfully with the following
  shells:
  
    - Bash 4.1
    - Bash 3.2
    - Bash 3.0
    - Bash 2.05b
    - dash 0.5.5.1
    - dash 0.5.2
    - AT&T Ksh 93u (from official Debian package)
    - MirBSD Korn Shell 40.2 (from official Debian package)
    - Solaris 9, 10 and 11 /bin/ksh
    - Solaris 9, 10 and 11 /usr/xpg4/bin/sh
    - NetBSD 5.1 /bin/sh
    - NetBSD 5.1 /bin/ksh
  
  * t/ax/test-init.sh (Exit): Rename ...
  (_am_exit): ... like this.
  (exit): New alias for '_am_exit'.  We cannot simply redefine 'exit'
  as a shell function, because some shells (dash 0.5.5.1, Solaris 10
  /bin/ksh and /usr/xpg4/bin/sh) do not allow it.
  (_am_exit, trap): Add extra escaping for 'exit' calls, to ensure we
  really invoke the 'exit' builtin and not our alias with the same
  name.
  * configure.ac: Check that the shell selected to run our testsuite
  supports aliases named like shell builtins.
  * t/REAMDE: Adjust.
  * All tests: Adjust, by simply using 'exit' instead of 'Exit'.
  * t/self-check-explicit-skips.sh: Adjust: the first usage of 'exit'
  after it has been redefined as an alias must be on a new line w.r.t.
  that where the alias is defined, in order for the redefinition to be
  honored.
  * syntax-checks.mk (sc_tests_Exit_not_exit): Delete.
  (sc_tests_exit_not_Exit): New.
  (syntax_check_rules): Adjust.
  (sc_tests_automake_fails): Simplify the recipe a little.
  * Several tests: Remove now useless spurious quoting once required
  to placate the 'sc_tests_Exit_not_exit' maintainer check.
  * gen-testsuite-part: Likewise.  Also, avoid uses of 'Exit' in the
  generated scripts.
  
  Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
  

Download

• t/tap-diagnostic-custom.sh

• #! /bin/sh
  # Copyright (C) 2011-2012 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
  # the Free Software Foundation; either version 2, or (at your option)
  # any later version.
  #
  # This program is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  # TAP support:
  #  - option '--diagnostic-string' to customize the string introducing
  #    TAP diagnostics
  
  . ./defs || exit 1
  
  fetch_tap_driver
  
  cat >> configure.ac <<END
  AC_OUTPUT
  END
  
  cat > Makefile.am << 'END'
  my_log_driver = $(srcdir)/tap-driver
  my_log_compiler = cat
  TEST_EXTENSIONS =
  TESTS =
  END
  
  : > later.mk
  
  # Quoting our comments below is an hack required to keep
  # comments near the things they refer to.
  i=0
  for string in \
  '## A letter' \
      a \
  '## A number' \
      1023 \
  '## A non-alphabetic character' \
      @ \
  '## Some metacharacters (we need to repeat the "$" for make)' \
      '^>;&*"|$$' \
  '## A whitespace character' \
      " " \
  '## A tab character' \
      "$tab" \
  '## A string with more whitespace' \
      "  ${tab}a b${tab} c" \
  '## Note the we do not have the empty string here.  We prefer to' \
  '## leave its behaviour in this context undefined for the moment.'
  do
    case $string in '##'*) continue;; esac
    i=$(($i + 1))
    unindent >> Makefile.am << END
      TEST_EXTENSIONS += .t$i
      TESTS += foo$i.t$i
      T${i}_LOG_COMPILER = \$(my_log_compiler)
      T${i}_LOG_DRIVER = \$(my_log_driver)
      AM_T${i}_LOG_DRIVER_FLAGS = \
        --comments \
        --diagnostic-string '$string'
  END
    unindent > foo$i.t$i <<END
      1..1
      ok 1
      $string blah blah $i
  END
      echo "AM_T${i}_LOG_DRIVER_FLAGS = --no-comments" >> later.mk
  done
  
  $ACLOCAL
  $AUTOCONF
  $AUTOMAKE
  
  ./configure
  
  $MAKE check >stdout || { cat stdout; exit 1; }
  cat stdout
  count_test_results total=$i pass=$i fail=0 xpass=0 xfail=0 skip=0 error=0
  
  cat later.mk >> Makefile
  $MAKE check >stdout || { cat stdout; exit 1; }
  cat stdout
  $FGREP 'blah blah' stdout && exit 1
  
  :
  

Download