From 3a1a8c6d3cb46bfe65b715ddd8a3e0d7e27e1bf7 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 22 Jun 2012 11:40:39 +0200 Subject: [PATCH] tests: automatic re-execution works for non-POSIX shells too Some inferior shells are too greedy in parsing their input. If a non-POSIX Bourne shell (like Solaris 10 /bin/sh) was used to launch one of our test scripts, it would fail unconditionally, because it unexpectedly saw some (by it) unsupported constructs, notwithstanding such constructs being placed *after* the code implementing automatic test re-execution with a better shell. In conclusion, the shell bailed out like this: $ /bin/sh t/ar.sh $ t/ar.sh: syntax error at line 257: `is_newest_files=$' unexpected By moving all the potentially problematic code in a separate file, to be sourced only after the code for automatic re-execution with a better shell, we ensure that inferior shell cannot see such code by mistake. * defs: All code after automatic shell re-execution moved out ... * t/ax/test-init.sh: ... to this new file. * syntax-checks.mk (xdefs): Add it. * Makefile.am (dist_check_DATA): Add it. Also move in 'defs' from a less explicit 'check_DATA' declaration. (nodist_check_DATA): Move in 'defs-static' from a less explicit 'check_DATA' declaration. (check_DATA): Remove. * t/self-check-sanity.sh: Remove, it was actually too hacky and brittle, sanity-checking situations we don0t actually care about. * t/list-of-tests.mk: Adjust. * t/self-check-explicit-skips.sh: Adjust, and fix a botched heading comments while we are at it. * t/self-check-reexec.tap: Adjust. * t/self-check-cleanup.tap: Likewise. Signed-off-by: Stefano Lattarini --- Makefile.am | 7 +- defs | 1081 +--------------------------------------- syntax-checks.mk | 2 +- t/ax/test-init.sh | 1052 ++++++++++++++++++++++++++++++++++++++ t/list-of-tests.mk | 1 - t/self-check-cleanup.tap | 22 +- t/self-check-explicit-skips.sh | 34 +- t/self-check-reexec.tap | 13 +- t/self-check-sanity.sh | 77 --- 9 files changed, 1122 insertions(+), 1167 deletions(-) create mode 100644 t/ax/test-init.sh delete mode 100755 t/self-check-sanity.sh diff --git a/Makefile.am b/Makefile.am index 57a2137..c464d8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -387,8 +387,11 @@ $(srcdir)/t/testsuite-part.am: $(srcdir)/gen-testsuite-part Makefile.am # Static dependencies valid for each test case. check_SCRIPTS = t/wrap/aclocal-$(APIVERSION) t/wrap/automake-$(APIVERSION) -dist_check_DATA = t/ax/plain-functions.sh t/ax/tap-functions.sh -check_DATA = defs defs-static +dist_check_DATA = \ + t/ax/test-init.sh \ + t/ax/plain-functions.sh \ + t/ax/tap-functions.sh +nodist_check_DATA = defs-static # Few more static dependencies. t/distcheck-missing-m4.log: t/ax/distcheck-hook-m4.am diff --git a/defs b/defs index 77d616e..559eea0 100644 --- a/defs +++ b/defs @@ -15,84 +15,33 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -######################################################## -### IMPORTANT NOTE: keep this file 'set -e' clean. ### -######################################################## - -# NOTE: This file should execute correctly with any system's /bin/sh -# shell, and not only with configure-time detected $AM_TEST_RUNNER_SHELL, -# *until differently and explicitly specified*. - -## -------------------------------------------------------- ## -## Source static setup and definitions for the testsuite. ## -## -------------------------------------------------------- ## +# *** IMPORTANT NOTE *** +# This file should execute correctly with any system's /bin/sh (which +# might be just a Bourne shell, non POSIX-conforming, like on Solaris +# up to version 11 at least). # Ensure we are running from the right directory. -test -f ./defs-static || { - echo "$0: ./defs-static: not found in current directory" >&2 - exit 99 -} - -# Source the shell sanitization and variables' definitions. -. ./defs-static || exit 99 - -# Enable the errexit shell flag early. -set -e - -# The name of the current test (without the '.sh' or '.tap' suffix). -# Test scripts can override it if they need to (but this should -# be done carefully, and *before* including ./defs). -if test -z "$me"; then - # Guard against failure to spawn sed (seen on MSYS), or empty $argv0. - me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.sh$//;s/\.tap$//'` \ - && test -n "$me" \ - || { echo "$argv0: failed to define \$me" >&2; exit 99; } -fi - -## ---------------------- ## -## Early sanity checks. ## -## ---------------------- ## - -# A single whitespace character. -sp=' ' -# A tabulation character. -tab=' ' -# A newline character. -nl=' -' - -# As autoconf-generated configure scripts do, ensure that IFS -# is defined initially, so that saving and restoring $IFS works. -IFS=$sp$tab$nl - -# Ensure $am_top_srcdir is set correctly. -test -f "$am_top_srcdir/defs-static.in" || { - echo "$me: $am_top_srcdir/defs-static.in not found," \ - "check \$am_top_srcdir" >&2 - exit 99 -} - -# Ensure $am_top_builddir is set correctly. -test -f "$am_top_builddir/defs-static" || { - echo "$me: $am_top_builddir/defs-static not found," \ - "check \$am_top_builddir" >&2 +for f in defs-static t/ax/test-init.sh; do + if test ! -f ./$f; then + echo "$0: ./$f: not found in current directory" >&2 exit 99 -} - + fi +done -## ------------------------------------ ## -## Ensure we run with a proper shell. ## -## ------------------------------------ ## +# Source the shell static setup and variable definitions. +. ./defs-static +test $? -eq 0 || exit 99 -# Make sure we run with the shell detected at configure time (unless -# the user forbids it). +# Make sure we run with the shell detected at configure time or forced +# by the user (unless the user forbids it). That is assumed to be a +# proper POSIX shell. case ${AM_TESTS_REEXEC-yes} in n|no|false|0) ;; *) # Ensure we can find ourselves. if test ! -f "$0"; then - echo "$me: unable to find myself: $0" >&2 + echo "$0: unable to find myself" >&2 exit 99 fi AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC @@ -105,996 +54,14 @@ case ${AM_TESTS_REEXEC-yes} in *x*) opts=-x;; *) opts=;; esac - echo $me: exec $AM_TEST_RUNNER_SHELL $opts "$0" "$*" - exec $AM_TEST_RUNNER_SHELL $opts "$0" ${1+"$@"} || { - echo "$me: failed to re-execute with $AM_TEST_RUNNER_SHELL" >&2 - exit 99 - } - ;; -esac - -# NOTE: From this point on, we can assume this file is being executed -# by the configure-time detected $AM_TEST_RUNNER_SHELL. - - -## ----------------------- ## -## Early debugging info. ## -## ----------------------- ## - -echo "Running from installcheck: $am_running_installcheck" -echo "Using TAP: $am_using_tap" -echo "PATH = $PATH" - - -## ---------------------- ## -## Environment cleanup. ## -## ---------------------- ## - -# Temporarily disable this, since some shells (e.g., older version -# of Bash) can return a non-zero exit status upon the when a non-set -# variable is unset. -set +e - -# Unset some make-related variables that may cause $MAKE to act like -# a recursively invoked sub-make. Any $MAKE invocation in a test is -# conceptually an independent invocation, not part of the main -# 'automake' build. -unset MFLAGS MAKEFLAGS AM_MAKEFLAGS MAKELEVEL -unset __MKLVL__ MAKE_JOBS_FIFO # For BSD make. -unset DMAKE_CHILD DMAKE_DEF_PRINTED DMAKE_MAX_JOBS # For Solaris dmake. -# Unset verbosity flag. -unset V -# Also unset variables that will let "make -e install" divert -# files into unwanted directories. -unset DESTDIR -unset prefix exec_prefix bindir datarootdir datadir docdir dvidir -unset htmldir includedir infodir libdir libexecdir localedir mandir -unset oldincludedir pdfdir psdir sbindir sharedstatedir sysconfdir -# Unset variables that might change the "make distcheck" behaviour. -unset DISTCHECK_CONFIGURE_FLAGS AM_DISTCHECK_CONFIGURE_FLAGS -# Used by install rules for info files. -unset AM_UPDATE_INFO_DIR -# The tests call "make -e" but we do not want $srcdir from the environment -# to override the definition from the Makefile. -unset srcdir -# Also unset variables that control our test driver. While not -# conceptually independent, they cause some changed semantics we -# need to control (and test for) in some of the tests to ensure -# backward-compatible behavior. -unset TESTS_ENVIRONMENT AM_TESTS_ENVIRONMENT -unset DISABLE_HARD_ERRORS -unset AM_COLOR_TESTS -unset TESTS -unset XFAIL_TESTS -unset TEST_LOGS -unset TEST_SUITE_LOG -unset RECHECK_LOGS -unset VERBOSE -for pfx in TEST_ SH_ TAP_ ''; do - unset ${pfx}LOG_COMPILER - unset ${pfx}LOG_COMPILE # Not a typo! - unset ${pfx}LOG_FLAGS - unset AM_${pfx}LOG_FLAGS - unset ${pfx}LOG_DRIVER - unset ${pfx}LOG_DRIVER_FLAGS - unset AM_${pfx}LOG_DRIVER_FLAGS -done -unset pfx - -# Re-enable, it had been temporarily disabled above. -set -e - -## ---------------------------- ## -## Auxiliary shell functions. ## -## ---------------------------- ## - -# Tell whether we should keep the test directories around, even in -# case of success. By default, we don't. -am_keeping_testdirs () -{ - case $keep_testdirs in - ""|n|no|NO) return 1;; - *) return 0;; - esac -} - -# This is used in 'Exit' and in the exit trap. See comments in the latter -# for more information, -am__test_skipped=no - -# We use a trap below for cleanup. This requires us to go through -# hoops to get the right exit status transported through the signal. -# So use "Exit STATUS" instead of "exit STATUS" inside of the tests. -# Turn off errexit here so that we don't trip the bug with OSF1/Tru64 -# sh inside this function. -Exit () -{ - set +e - # See comments in the exit trap for the reason we do this. - test 77 = $1 && am__test_skipped=yes - (exit $1); exit $1 -} - -if test $am_using_tap = yes; then - am_funcs_file=tap-functions.sh -else - am_funcs_file=plain-functions.sh -fi - -if test -f "$am_testauxdir/$am_funcs_file"; then - . "$am_testauxdir/$am_funcs_file" || { - echo "$me: error sourcing $am_testauxdir/$am_funcs_file" >&2 - Exit 99 - } -else - echo "$me: $am_testauxdir/$am_funcs_file not found" >&2 - Exit 99 -fi -unset am_funcs_file - -# cross_compiling -# --------------- -# Tell whether we are cross-compiling. This is especially useful to skip -# tests (or portions of them) that requires a native compiler. -cross_compiling () -{ - # Quoting from the autoconf manual: - # ... [$host_alias and $build both] default to the result of running - # config.guess, unless you specify either --build or --host. In - # this case, the default becomes the system type you specified. - # If you specify both, *and they're different*, configure enters - # cross compilation mode (so it doesn't run any tests that require - # execution). - test x"$host_alias" != x && test x"$build_alias" != x"$host_alias" -} - -# is_newest FILE FILES -# -------------------- -# Return false if any file in FILES is newer than FILE. -# Resolve ties in favor of FILE. -is_newest () -{ - is_newest_files=$(find "$@" -prune -newer "$1") - test -z "$is_newest_files" -} - -# is_blocked_signal SIGNAL-NUMBER -# -------------------------------- -# Return success if the given signal number is blocked in the shell, -# return a non-zero exit status and print a proper diagnostic otherwise. -is_blocked_signal () -{ - # Use perl, since trying to do this portably in the shell can be - # very tricky, if not downright impossible. For reference, see: - # - if $PERL -w -e ' - use strict; - use warnings FATAL => "all"; - use POSIX; - my %oldsigaction = (); - sigaction('"$1"', 0, \%oldsigaction); - exit ($oldsigaction{"HANDLER"} eq "IGNORE" ? 0 : 77); - '; then - return 0 - elif test $? -eq 77; then - return 1 - else - fatal_ "couldn't determine whether signal $1 is blocked" - fi -} - -# AUTOMAKE_run [-e STATUS] [-d DESCRIPTION] [--] [AUTOMAKE-ARGS...] -# ----------------------------------------------------------------- -# Run automake with AUTOMAKE-ARGS, and fail if it doesn't exit with -# STATUS. Should be polymorphic for TAP and "plain" tests. The -# DESCRIPTION, when provided, is used for console reporting, only if -# the TAP protocol is in use in the current test script. -AUTOMAKE_run () -{ - am__desc= - am__exp_rc=0 - while test $# -gt 0; do - case $1 in - -d) am__desc=$2; shift;; - -e) am__exp_rc=$2; shift;; - --) shift; break;; - # Don't fail on unknown option: assume they (and the rest of the - # command line) are to be passed verbatim to automake (so stop our - # own option parsing). - *) break;; - esac - shift - done - am__got_rc=0 - $AUTOMAKE ${1+"$@"} >stdout 2>stderr || am__got_rc=$? - cat stderr >&2 - cat stdout - if test $am_using_tap != yes; then - test $am__got_rc -eq $am__exp_rc || Exit 1 - return - fi - if test -z "$am__desc"; then - if test $am__got_rc -eq $am__exp_rc; then - am__desc="automake exited $am__got_rc" - else - am__desc="automake exited $am__got_rc, expecting $am__exp_rc" - fi - fi - command_ok_ "$am__desc" test $am__got_rc -eq $am__exp_rc -} - -# AUTOMAKE_fails [-d DESCRIPTION] [OPTIONS...] -# -------------------------------------------- -# Run automake with OPTIONS, and fail if doesn't exit with status 1. -# Should be polymorphic for TAP and "plain" tests. The DESCRIPTION, -# when provided, is used for console reporting, only if the TAP -# protocol is in use in the current test script. -AUTOMAKE_fails () -{ - AUTOMAKE_run -e 1 ${1+"$@"} -} - -# extract_configure_help { --OPTION | VARIABLE-NAME } [FILES] -# ----------------------------------------------------------- -# Use this to extract from the output of "./configure --help" (or similar) -# the description or help message associated to the given --OPTION or -# VARIABLE-NAME. -extract_configure_help () -{ - am__opt_re='' am__var_re='' - case $1 in - --*'=') am__opt_re="^ $1";; - --*'[=]') am__opt_re='^ '$(printf '%s\n' "$1" | sed 's/...$//')'\[=';; - --*) am__opt_re="^ $1( .*|$)";; - *) am__var_re="^ $1( .*|$)";; - esac - shift - if test x"$am__opt_re" != x; then - LC_ALL=C awk ' - /'"$am__opt_re"'/ { print; do_print = 1; next; } - /^$/ { do_print = 0; next } - /^ --/ { do_print = 0; next } - (do_print == 1) { print } - ' ${1+"$@"} - else - LC_ALL=C awk ' - /'"$am__var_re"'/ { print; do_print = 1; next; } - /^$/ { do_print = 0; next } - /^ [A-Z][A-Z0-9_]* / { do_print = 0; next } - /^ [A-Z][A-Z0-9_]*$/ { do_print = 0; next } - (do_print == 1) { print } - ' ${1+"$@"} - fi -} - -# grep_configure_help { --OPTION | VARIABLE-NAME } REGEXP -# ------------------------------------------------------- -# Grep the section of "./configure --help" output associated with either -# --OPTION or VARIABLE-NAME for the given *extended* regular expression. -grep_configure_help () -{ - ./configure --help > am--all-help \ - || { cat am--all-help; Exit 1; } - cat am--all-help - extract_configure_help "$1" am--all-help > am--our-help \ - || { cat am--our-help; Exit 1; } - cat am--our-help - $EGREP "$2" am--our-help || Exit 1 -} - -# using_gmake -# ----------- -# Return success if $MAKE is GNU make, return failure otherwise. -# Caches the result for speed reasons. -using_gmake () -{ - case $am__using_gmake in - yes) - return 0;; - no) - return 1;; - '') - # Use --version AND -v, because SGI Make doesn't fail on --version. - # Also grep for GNU because newer versions of FreeBSD make do - # not complain about --version (they seem to silently ignore it). - if $MAKE --version -v | grep GNU; then - am__using_gmake=yes - return 0 - else - am__using_gmake=no - return 1 - fi;; - *) - fatal_ "invalid value for \$am__using_gmake: '$am__using_gmake'";; - esac -} -am__using_gmake="" # Avoid interferences from the environment. - -# make_can_chain_suffix_rules -# --------------------------- -# Return 0 if $MAKE is a make implementation that can chain suffix rules -# automatically, return 1 otherwise. Caches the result for speed reasons. -make_can_chain_suffix_rules () -{ - if test -z "$am__can_chain_suffix_rules"; then - if using_gmake; then - am__can_chain_suffix_rules=yes - return 0 - else - mkdir am__chain.dir$$ - cd am__chain.dir$$ - unindent > Makefile << 'END' - .SUFFIXES: .u .v .w - .u.v: ; cp $< $@ - .v.w: ; cp $< $@ -END - echo make can chain suffix rules > foo.u - if $MAKE foo.w && diff foo.u foo.w; then - am__can_chain_suffix_rules=yes - else - am__can_chain_suffix_rules=no - fi - cd .. - rm -rf am__chain.dir$$ - fi - fi - case $am__can_chain_suffix_rules in - yes) return 0;; - no) return 1;; - *) fatal_ "make_can_chain_suffix_rules: internal error";; - esac -} -am__can_chain_suffix_rules="" # Avoid interferences from the environment. - -# useless_vpath_rebuild -# --------------------- -# Tell whether $MAKE suffers of the bug triggering automake bug#7884. -# For example, this happens with FreeBSD make, since in a VPATH build -# it tends to rebuilt files for which there is an explicit or even just -# a suffix rule, even if said files are already available in the VPATH -# directory. -useless_vpath_rebuild () -{ - if test -z "$am__useless_vpath_rebuild"; then - if using_gmake; then - am__useless_vpath_rebuild=no - return 1 - fi - mkdir am__vpath.dir$$ - cd am__vpath.dir$$ - touch foo.a foo.b bar baz - mkdir build - cd build - unindent > Makefile << 'END' - .SUFFIXES: .a .b - VPATH = .. - all: foo.b baz - .PHONY: all - .a.b: ; cp $< $@ - baz: bar ; cp ../baz bar -END - if $MAKE all && test ! -f foo.b && test ! -f bar; then - am__useless_vpath_rebuild=no - else - am__useless_vpath_rebuild=yes - fi - cd ../.. - rm -rf am__vpath.dir$$ - fi - case $am__useless_vpath_rebuild in - yes) return 0;; - no) return 1;; - "") ;; - *) fatal_ "no_useless_builddir_remake: internal error";; - esac -} -am__useless_vpath_rebuild="" - -yl_distcheck () { useless_vpath_rebuild || $MAKE distcheck ${1+"$@"}; } - -# seq_ - print a sequence of numbers -# ---------------------------------- -# This function simulates GNU seq(1) portably. Valid usages: -# - seq LAST -# - seq FIRST LAST -# - seq FIRST INCREMENT LAST -seq_ () -{ - case $# in - 0) fatal_ "seq_: missing argument";; - 1) seq_first=1 seq_incr=1 seq_last=$1;; - 2) seq_first=$1 seq_incr=1 seq_last=$2;; - 3) seq_first=$1 seq_incr=$2 seq_last=$3;; - *) fatal_ "seq_: too many arguments";; - esac - i=$seq_first - while test $i -le $seq_last; do - echo $i - i=$(($i + $seq_incr)) - done -} - -# rm_rf_ [FILES OR DIRECTORIES ...] -# --------------------------------- -# Recursively remove the given files or directory, also handling the case -# of non-writable subdirectories. -rm_rf_ () -{ - test $# -gt 0 || return 0 - # Ignore failures in find, we are only interested in failures of the - # final rm. - find "$@" -type d ! -perm -700 -exec chmod u+rwx {} \; || : - rm -rf "$@" -} - -# count_test_results total=N pass=N fail=N xpass=N xfail=N skip=N error=N -# ----------------------------------------------------------------------- -# Check that a testsuite run driven by the parallel-tests harness has -# had the specified numbers of test results (specified by kind). -# This function assumes that the output of "make check" or "make recheck" -# has been saved in the 'stdout' file in the current directory, and its -# log in the 'test-suite.log' file. -count_test_results () -{ - # Use a subshell so that we won't pollute the script namespace. - ( - # TODO: Do proper checks on the arguments? - total=ERR pass=ERR fail=ERR xpass=ERR xfail=ERR skip=ERR error=ERR - eval "$@" - # For debugging. - $EGREP -i '(total|x?pass|x?fail|skip|error)' stdout || : - rc=0 - # Avoid spurious failures with shells with "overly sensible" - # errexit shell flag, such as e.g., Solaris /bin/sh. - set +e - test $(grep -c '^PASS:' stdout) -eq $pass || rc=1 - test $(grep -c '^XFAIL:' stdout) -eq $xfail || rc=1 - test $(grep -c '^SKIP:' stdout) -eq $skip || rc=1 - test $(grep -c '^FAIL:' stdout) -eq $fail || rc=1 - test $(grep -c '^XPASS:' stdout) -eq $xpass || rc=1 - test $(grep -c '^ERROR:' stdout) -eq $error || rc=1 - grep "^# TOTAL: *$total$" stdout || rc=1 - grep "^# PASS: *$pass$" stdout || rc=1 - grep "^# XFAIL: *$xfail$" stdout || rc=1 - grep "^# SKIP: *$skip$" stdout || rc=1 - grep "^# FAIL: *$fail$" stdout || rc=1 - grep "^# XPASS: *$xpass$" stdout || rc=1 - grep "^# ERROR: *$error$" stdout || rc=1 - test $rc -eq 0 - ) -} - -commented_sed_unindent_prog=' - /^$/b # Nothing to do for empty lines. - x # Get x into pattern space. - /^$/{ # No prior x, go prepare it. - g # Copy this 1st non-blank line into pattern space. - s/^\(['"$tab"' ]*\).*/x\1/ # Prepare x in pattern space. - } # Now: x in pattern and in hold. - G # Build x\n in pattern space, and - h # duplicate it into hold space. - s/\n.*$// # Restore x in pattern space, and - x # exchange with the above duplicate in hold space. - s/^x\(.*\)\n\1// # Remove leading from . - s/^x.*\n// # Restore when there is no leading . -' - -# unindent [input files...] -# ------------------------- -# Remove the "proper" amount of leading whitespace from the given files, -# and output the result on stdout. That amount is determined by looking -# at the leading whitespace of the first non-blank line in the input -# files. If no input file is specified, standard input is implied. -unindent () -{ - if test x"$sed_unindent_prog" = x; then - sed_unindent_prog=$(printf '%s\n' "$commented_sed_unindent_prog" \ - | sed -e "s/ *# .*//") - fi - sed "$sed_unindent_prog" ${1+"$@"} -} -sed_unindent_prog="" # Avoid interferences from the environment. - -# get_shell_script SCRIPT-NAME -# ----------------------------- -# Fetch an Automake-provided shell script from the 'lib/' directory into -# the current directory, and, if the '$am_test_prefer_config_shell' -# variable is set to "yes", modify its shebang line to use $SHELL instead -# of /bin/sh. -get_shell_script () -{ - test ! -f "$1" || rm -f "$1" || return 99 - if test x"$am_test_prefer_config_shell" = x"yes"; then - sed "1s|#!.*|#! $SHELL|" "$am_scriptdir/$1" > "$1" \ - && chmod a+x "$1" \ - || return 99 - else - cp -f "$am_scriptdir/$1" . || return 99 - fi - sed 10q "$1" # For debugging. -} - -# require_xsi SHELL -# ----------------- -# Skip the test if the given shell fails to support common XSI constructs. -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_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. -xsi_shell_code=' - _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval '\''test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5'\' - -# fetch_tap_driver -# ---------------- -# Fetch the Automake-provided TAP driver from the 'lib/' directory into -# the current directory, and edit its shebang line so that it will be -# run with the perl interpreter determined at configure time. -fetch_tap_driver () -{ - # TODO: we should devise a way to make the shell TAP driver tested also - # TODO: with /bin/sh, for better coverage. - case $am_tap_implementation in - perl) - $PERL -MTAP::Parser -e 1 \ - || skip_all_ "cannot import TAP::Parser perl module" - sed "1s|#!.*|#! $PERL -w|" "$am_scriptdir"/tap-driver.pl >tap-driver - ;; - shell) - AM_TAP_AWK=$AWK; export AM_TAP_AWK - sed "1s|#!.*|#! $SHELL|" "$am_scriptdir"/tap-driver.sh >tap-driver - ;; - *) - fatal_ "invalid \$am_tap_implementation '$am_tap_implementation'" ;; - esac \ - && chmod a+x tap-driver \ - || framework_failure_ "couldn't fetch $am_tap_implementation TAP driver" - sed 10q tap-driver # For debugging. -} -# The shell/awk implementation of the TAP driver is still mostly dummy, so -# use the perl implementation by default for the moment. -am_tap_implementation=${am_tap_implementation-shell} - -# Usage: require_compiler_ {cc|c++|fortran|fortran77} -require_compiler_ () -{ - case $# in - 0) fatal_ "require_compiler_: missing argument";; - 1) ;; - *) fatal_ "require_compiler_: too many arguments";; - esac - case $1 in - cc) - am__comp_lang="C" - am__comp_var=CC - am__comp_flag_vars='CFLAGS CPPFLAGS' - ;; - c++) - am__comp_lang="C++" - am__comp_var=CXX - am__comp_flag_vars='CXXFLAGS CPPFLAGS' - ;; - fortran) - am__comp_lang="Fortran" - am__comp_var=FC - am__comp_flag_vars='FCFLAGS' - ;; - fortran77) - am__comp_lang="Fortran 77" - am__comp_var=F77 - am__comp_flag_vars='FFLAGS' - ;; - esac - shift - eval "am__comp_prog=\${$am__comp_var}" \ - || fatal_ "expanding \${$am__comp_var} in require_compiler_" - case $am__comp_prog in - "") - fatal_ "botched configuration: \$$am__comp_var is empty";; - false) - skip_all_ "no $am__comp_lang compiler available";; - autodetect|autodetected) - # Let the ./configure commands in the test script try to determine - # these automatically. - unset $am__comp_var $am__comp_flag_vars;; - *) - # Pre-set these for the ./configure commands in the test script. - export $am__comp_var $am__comp_flag_vars;; - esac - # Delete private variables. - unset am__comp_lang am__comp_prog am__comp_var am__comp_flag_vars -} - -## ----------------------------------------------------------- ## -## Checks for required tools, and additional setups (if any) ## -## required by them. ## -## ----------------------------------------------------------- ## - -# Performance tests must be enabled explicitly. -case $argv0 in - */perf/*) - case $AM_TESTSUITE_PERF in - [yY]|[yY]es|1) ;; - *) skip_ "performance tests not explicitly enabled" ;; - esac + echo exec $AM_TEST_RUNNER_SHELL $opts "$0" "$*" + exec $AM_TEST_RUNNER_SHELL $opts "$0" ${1+"$@"} + # This should be dead code, unless some strange error happened. + echo "$0: failed to re-execute with $AM_TEST_RUNNER_SHELL" >&2 + exit 99 ;; esac -# Look for (and maybe set up) required tools and/or system features; skip -# the current test if they are not found. -for tool in : $required -do - # Check that each required tool is present. - case $tool in - :) ;; - cc|c++|fortran|fortran77) - require_compiler_ $tool;; - xsi-lib-shell) - if test x"$am_test_prefer_config_shell" = x"yes"; then - require_xsi "$SHELL" - else - require_xsi "/bin/sh" - fi - ;; - bzip2) - # 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" - ;; - cl) - CC=cl - # Don't export CFLAGS, as that could have been initialized to only - # work with the C compiler detected at configure time. If the user - # wants CFLAGS to also influence 'cl', he can still export CFLAGS - # in the environment "by hand" before calling the testsuite. - export CC CPPFLAGS - echo "$me: running $CC -?" - $CC -? || skip_all_ "Microsoft C compiler '$CC' not available" - ;; - etags) - # Exuberant Ctags will create a TAGS file even - # when asked for --help or --version. (Emacs's etags - # does not have such problem.) Use -o /dev/null - # to make sure we do not pollute the build directory. - echo "$me: running etags --version -o /dev/null" - etags --version -o /dev/null \ - || skip_all_ "required program 'etags' not available" - ;; - GNUmake) - for make_ in "$MAKE" gmake gnumake :; do - MAKE=$make_ am__using_gmake='' - test "$MAKE" = : && break - echo "$me: determine whether $MAKE is GNU make" - using_gmake && break - : For shells with busted 'set -e'. - done - test "$MAKE" = : && skip_all_ "this test requires GNU make" - export MAKE - unset make_ - ;; - gcj) - GCJ=$GNU_GCJ GCJFLAGS=$GNU_GCJFLAGS; export GCJ GCJFLAGS - test "$GCJ" = false && skip_all_ "GNU Java compiler unavailable" - : For shells with busted 'set -e'. - ;; - gcc) - CC=$GNU_CC CFLAGS=$GNU_CFLAGS; export CC CFLAGS CPPFLAGS - test "$CC" = false && skip_all_ "GNU C compiler unavailable" - : For shells with busted 'set -e'. - ;; - g++) - CXX=$GNU_CXX CXXFLAGS=$GNU_CXXFLAGS; export CXX CXXFLAGS CPPFLAGS - test "$CXX" = false && skip_all_ "GNU C++ compiler unavailable" - : For shells with busted 'set -e'. - ;; - gfortran) - FC=$GNU_FC FCFLAGS=$GNU_FCFLAGS; export FC FCFLAGS - test "$FC" = false && skip_all_ "GNU Fortran compiler unavailable" - case " $required " in - *\ g77\ *) ;; - *) F77=$FC FFLAGS=$FCFLAGS; export F77 FFLAGS;; - esac - ;; - g77) - F77=$GNU_F77 FFLAGS=$GNU_FFLAGS; export F77 FFLAGS - test "$F77" = false && skip_all_ "GNU Fortran 77 compiler unavailable" - case " $required " in - *\ gfortran\ *) ;; - *) FC=$F77 FCFLAGS=$FFLAGS; export FC FCFLAGS;; - esac - ;; - javac) - # The Java compiler from JDK 1.5 (and presumably earlier versions) - # cannot handle the '-version' option by itself: it bails out - # 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_all_ "Sun Java compiler not available" - ;; - java) - # See the comments above about 'javac' for why we use also '-help'. - echo "$me: running java -version -help" - java -version -help || skip_all_ "Sun Java interpreter not found" - ;; - lib) - AR=lib - export AR - # Attempting to create an empty archive will actually not - # create the archive, but lib will output its version. - echo "$me: running $AR -out:defstest.lib" - $AR -out:defstest.lib \ - || skip_all_ "Microsoft 'lib' utility not available" - ;; - makedepend) - echo "$me: running makedepend -f-" - makedepend -f- \ - || 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_all_ "cannot find a makeinfo program that groks" \ - "the '--html' option" - ;; - mingw) - uname_s=$(uname -s || echo UNKNOWN) - echo "$me: system name: $uname_s" - case $uname_s in - MINGW*) ;; - *) skip_all_ "this test requires MSYS in MinGW mode" ;; - esac - unset uname_s - ;; - non-root) - # Skip this test case if the user is root. - # We try to append to a read-only file to detect this. - priv_check_temp=priv-check.$$ - touch $priv_check_temp && chmod a-w $priv_check_temp \ - || framework_failure_ "creating unwritable file $priv_check_temp" - # Not a useless use of subshell: lesser shells like Solaris /bin/sh - # can exit if a builtin fails. - overwrite_status=0 - (echo foo >> $priv_check_temp) || overwrite_status=$? - rm -f $priv_check_temp - if test $overwrite_status -eq 0; then - skip_all_ "cannot drop file write permissions" - fi - unset priv_check_temp overwrite_status - ;; - perl-threads) - if test "$WANT_NO_THREADS" = "yes"; then - skip_all_ "Devel::Cover cannot cope with threads" - fi - ;; - native) - # Don't use "&&" here, to avoid a bug of 'set -e' present in - # some (even relatively recent) versions of the BSD shell. - # We add the dummy "else" branch for extra safety. - ! 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_all_ "python interpreter not available" - ;; - ro-dir) - # Skip this test case if read-only directories aren't supported - # (e.g., under DOS.) - ro_dir_temp=ro_dir.$$ - mkdir $ro_dir_temp && chmod a-w $ro_dir_temp \ - || framework_failure_ "creating unwritable directory $ro_dir_temp" - # Not a useless use of subshell: lesser shells like Solaris /bin/sh - # can exit if a builtin fails. - create_status=0 - (: > $ro_dir_temp/probe) || create_status=$? - rm -rf $ro_dir_temp - if test $create_status -eq 0; then - skip_all_ "cannot drop directory write permissions" - fi - unset ro_dir_temp create_status - ;; - runtest) - # DejaGnu's runtest program. We rely on being able to specify - # the program on the runtest command-line. This requires - # DejaGnu 1.4.3 or later. - echo "$me: running runtest SOMEPROGRAM=someprogram --version" - runtest SOMEPROGRAM=someprogram --version \ - || 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_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_all_ "required program 'texi2dvi' not available" - ;; - lex) - test x"$LEX" = x"false" && skip_all_ "lex not found or disabled" - export LEX - ;; - yacc) - test x"$YACC" = x"false" && skip_all_ "yacc not found or disabled" - export YACC - ;; - flex) - LEX=flex; export LEX - echo "$me: running flex --version" - flex --version || skip_all_ "required program 'flex' not available" - ;; - bison) - YACC='bison -y'; export YACC - echo "$me: running bison --version" - bison --version || skip_all_ "required program 'bison' not available" - ;; - *) - # 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 - # we need the subshell here. Also, some tools, like Sun cscope, - # can be interactive without redirection. - ($tool --version) -trap "trap '' 13; fatal_ 'caught signal SIGPIPE'" 13 - -# Create and populate the temporary directory, if and as required. -if test x"$am_create_testdir" = x"no"; then - testSubDir= -else - # The subdirectory where the current test script will run and write its - # temporary/data files. This will be created shortly, and will be removed - # by the cleanup trap below if the test passes. If the test doesn't pass, - # this directory will be kept, to facilitate debugging. - testSubDir=t/$me.dir - test ! -d $testSubDir || rm_rf_ $testSubDir \ - || framework_failure_ "removing old test subdirectory" - test -d t || mkdir t - mkdir $testSubDir \ - || framework_failure_ "creating test subdirectory" - # The trailing './'ris to avoid CDPATH issues. - cd ./$testSubDir \ - || framework_failure_ "cannot chdir into test subdirectory" - if test x"$am_create_testdir" != x"empty"; then - cp "$am_scriptdir"/install-sh "$am_scriptdir"/missing \ - "$am_scriptdir"/depcomp . \ - || framework_failure_ "fetching common files from $am_scriptdir" - # Build appropriate environment in test directory. E.g., create - # configure.ac, touch all necessary files, etc. Don't use AC_OUTPUT, - # but AC_CONFIG_FILES so that appending still produces a valid - # configure.ac. But then, tests running config.status really need - # to append AC_OUTPUT. - { - echo "AC_INIT([$me], [1.0])" - if test x"$am_serial_tests" = x"yes"; then - echo "AM_INIT_AUTOMAKE" - else - echo "AM_INIT_AUTOMAKE([parallel-tests])" - fi - echo "AC_CONFIG_FILES([Makefile])" - } >configure.ac || framework_failure_ "creating configure.ac skeleton" - fi -fi - - -## ---------------- ## -## Ready to go... ## -## ---------------- ## - -set -x -pwd +# Source the actual test initialization and setup code, and return +# control to the test script that is sourcing us. +. "$am_testauxdir/test-init.sh" diff --git a/syntax-checks.mk b/syntax-checks.mk index c09156e..f610a25 100644 --- a/syntax-checks.mk +++ b/syntax-checks.mk @@ -31,7 +31,7 @@ xtests := $(shell \ done; \ done | sort) -xdefs = $(srcdir)/defs $(srcdir)/defs-static.in +xdefs = $(srcdir)/t/ax/test-init.sh $(srcdir)/defs $(srcdir)/defs-static.in ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name '*.am' -print) diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh new file mode 100644 index 0000000..fe28f9a --- /dev/null +++ b/t/ax/test-init.sh @@ -0,0 +1,1052 @@ +# -*- shell-script -*- +# +# Copyright (C) 1996-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 . + +######################################################## +### IMPORTANT NOTE: keep this file 'set -e' clean. ### +######################################################## + +# Enable the errexit shell flag early. +set -e + +# The name of the current test (without the '.sh' or '.tap' suffix). +# Test scripts can override it if they need to (but this should +# be done carefully). +if test -z "$me"; then + # Guard against failure to spawn sed (seen on MSYS), or empty $argv0. + me=`echo "$argv0" | sed -e 's,.*[\\/],,;s/\.sh$//;s/\.tap$//'` \ + && test -n "$me" \ + || { echo "$argv0: failed to define \$me" >&2; exit 99; } +fi + + +## --------------------- ## +## Early sanity checks. ## +## --------------------- ## + +# Ensure $am_top_srcdir is set correctly. +test -f "$am_top_srcdir/defs-static.in" || { + echo "$me: $am_top_srcdir/defs-static.in not found," \ + "check \$am_top_srcdir" >&2 + exit 99 +} + +# Ensure $am_top_builddir is set correctly. +test -f "$am_top_builddir/defs-static" || { + echo "$me: $am_top_builddir/defs-static not found," \ + "check \$am_top_builddir" >&2 + exit 99 +} + + +## ------------------ ## +## Early variables. ## +## ------------------ ## + +# A single whitespace character. +sp=' ' +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + +# As autoconf-generated configure scripts do, ensure that IFS +# is defined initially, so that saving and restoring $IFS works. +IFS=$sp$tab$nl + + +## ----------------------- ## +## Early debugging info. ## +## ----------------------- ## + +echo "Running from installcheck: $am_running_installcheck" +echo "Using TAP: $am_using_tap" +echo "PATH = $PATH" + + +## ---------------------- ## +## Environment cleanup. ## +## ---------------------- ## + +# Temporarily disable this, since some shells (e.g., older version +# of Bash) can return a non-zero exit status upon the when a non-set +# variable is unset. +set +e + +# Unset some make-related variables that may cause $MAKE to act like +# a recursively invoked sub-make. Any $MAKE invocation in a test is +# conceptually an independent invocation, not part of the main +# 'automake' build. +unset MFLAGS MAKEFLAGS AM_MAKEFLAGS MAKELEVEL +unset __MKLVL__ MAKE_JOBS_FIFO # For BSD make. +unset DMAKE_CHILD DMAKE_DEF_PRINTED DMAKE_MAX_JOBS # For Solaris dmake. +# Unset verbosity flag. +unset V +# Also unset variables that will let "make -e install" divert +# files into unwanted directories. +unset DESTDIR +unset prefix exec_prefix bindir datarootdir datadir docdir dvidir +unset htmldir includedir infodir libdir libexecdir localedir mandir +unset oldincludedir pdfdir psdir sbindir sharedstatedir sysconfdir +# Unset variables that might change the "make distcheck" behaviour. +unset DISTCHECK_CONFIGURE_FLAGS AM_DISTCHECK_CONFIGURE_FLAGS +# Used by install rules for info files. +unset AM_UPDATE_INFO_DIR +# The tests call "make -e" but we do not want $srcdir from the environment +# to override the definition from the Makefile. +unset srcdir +# Also unset variables that control our test driver. While not +# conceptually independent, they cause some changed semantics we +# need to control (and test for) in some of the tests to ensure +# backward-compatible behavior. +unset TESTS_ENVIRONMENT AM_TESTS_ENVIRONMENT +unset DISABLE_HARD_ERRORS +unset AM_COLOR_TESTS +unset TESTS +unset XFAIL_TESTS +unset TEST_LOGS +unset TEST_SUITE_LOG +unset RECHECK_LOGS +unset VERBOSE +for pfx in TEST_ SH_ TAP_ ''; do + unset ${pfx}LOG_COMPILER + unset ${pfx}LOG_COMPILE # Not a typo! + unset ${pfx}LOG_FLAGS + unset AM_${pfx}LOG_FLAGS + unset ${pfx}LOG_DRIVER + unset ${pfx}LOG_DRIVER_FLAGS + unset AM_${pfx}LOG_DRIVER_FLAGS +done +unset pfx + +# Re-enable, it had been temporarily disabled above. +set -e + +## ---------------------------- ## +## Auxiliary shell functions. ## +## ---------------------------- ## + +# Tell whether we should keep the test directories around, even in +# case of success. By default, we don't. +am_keeping_testdirs () +{ + case $keep_testdirs in + ""|n|no|NO) return 1;; + *) return 0;; + esac +} + +# This is used in 'Exit' and in the exit trap. See comments in the latter +# for more information, +am__test_skipped=no + +# We use a trap below for cleanup. This requires us to go through +# hoops to get the right exit status transported through the signal. +# So use "Exit STATUS" instead of "exit STATUS" inside of the tests. +# Turn off errexit here so that we don't trip the bug with OSF1/Tru64 +# sh inside this function. +Exit () +{ + set +e + # See comments in the exit trap for the reason we do this. + test 77 = $1 && am__test_skipped=yes + (exit $1); exit $1 +} + +if test $am_using_tap = yes; then + am_funcs_file=tap-functions.sh +else + am_funcs_file=plain-functions.sh +fi + +if test -f "$am_testauxdir/$am_funcs_file"; then + . "$am_testauxdir/$am_funcs_file" || { + echo "$me: error sourcing $am_testauxdir/$am_funcs_file" >&2 + Exit 99 + } +else + echo "$me: $am_testauxdir/$am_funcs_file not found" >&2 + Exit 99 +fi +unset am_funcs_file + +# cross_compiling +# --------------- +# Tell whether we are cross-compiling. This is especially useful to skip +# tests (or portions of them) that requires a native compiler. +cross_compiling () +{ + # Quoting from the autoconf manual: + # ... [$host_alias and $build both] default to the result of running + # config.guess, unless you specify either --build or --host. In + # this case, the default becomes the system type you specified. + # If you specify both, *and they're different*, configure enters + # cross compilation mode (so it doesn't run any tests that require + # execution). + test x"$host_alias" != x && test x"$build_alias" != x"$host_alias" +} + +# is_newest FILE FILES +# -------------------- +# Return false if any file in FILES is newer than FILE. +# Resolve ties in favor of FILE. +is_newest () +{ + is_newest_files=$(find "$@" -prune -newer "$1") + test -z "$is_newest_files" +} + +# is_blocked_signal SIGNAL-NUMBER +# -------------------------------- +# Return success if the given signal number is blocked in the shell, +# return a non-zero exit status and print a proper diagnostic otherwise. +is_blocked_signal () +{ + # Use perl, since trying to do this portably in the shell can be + # very tricky, if not downright impossible. For reference, see: + # + if $PERL -w -e ' + use strict; + use warnings FATAL => "all"; + use POSIX; + my %oldsigaction = (); + sigaction('"$1"', 0, \%oldsigaction); + exit ($oldsigaction{"HANDLER"} eq "IGNORE" ? 0 : 77); + '; then + return 0 + elif test $? -eq 77; then + return 1 + else + fatal_ "couldn't determine whether signal $1 is blocked" + fi +} + +# AUTOMAKE_run [-e STATUS] [-d DESCRIPTION] [--] [AUTOMAKE-ARGS...] +# ----------------------------------------------------------------- +# Run automake with AUTOMAKE-ARGS, and fail if it doesn't exit with +# STATUS. Should be polymorphic for TAP and "plain" tests. The +# DESCRIPTION, when provided, is used for console reporting, only if +# the TAP protocol is in use in the current test script. +AUTOMAKE_run () +{ + am__desc= + am__exp_rc=0 + while test $# -gt 0; do + case $1 in + -d) am__desc=$2; shift;; + -e) am__exp_rc=$2; shift;; + --) shift; break;; + # Don't fail on unknown option: assume they (and the rest of the + # command line) are to be passed verbatim to automake (so stop our + # own option parsing). + *) break;; + esac + shift + done + am__got_rc=0 + $AUTOMAKE ${1+"$@"} >stdout 2>stderr || am__got_rc=$? + cat stderr >&2 + cat stdout + if test $am_using_tap != yes; then + test $am__got_rc -eq $am__exp_rc || Exit 1 + return + fi + if test -z "$am__desc"; then + if test $am__got_rc -eq $am__exp_rc; then + am__desc="automake exited $am__got_rc" + else + am__desc="automake exited $am__got_rc, expecting $am__exp_rc" + fi + fi + command_ok_ "$am__desc" test $am__got_rc -eq $am__exp_rc +} + +# AUTOMAKE_fails [-d DESCRIPTION] [OPTIONS...] +# -------------------------------------------- +# Run automake with OPTIONS, and fail if doesn't exit with status 1. +# Should be polymorphic for TAP and "plain" tests. The DESCRIPTION, +# when provided, is used for console reporting, only if the TAP +# protocol is in use in the current test script. +AUTOMAKE_fails () +{ + AUTOMAKE_run -e 1 ${1+"$@"} +} + +# extract_configure_help { --OPTION | VARIABLE-NAME } [FILES] +# ----------------------------------------------------------- +# Use this to extract from the output of "./configure --help" (or similar) +# the description or help message associated to the given --OPTION or +# VARIABLE-NAME. +extract_configure_help () +{ + am__opt_re='' am__var_re='' + case $1 in + --*'=') am__opt_re="^ $1";; + --*'[=]') am__opt_re='^ '$(printf '%s\n' "$1" | sed 's/...$//')'\[=';; + --*) am__opt_re="^ $1( .*|$)";; + *) am__var_re="^ $1( .*|$)";; + esac + shift + if test x"$am__opt_re" != x; then + LC_ALL=C awk ' + /'"$am__opt_re"'/ { print; do_print = 1; next; } + /^$/ { do_print = 0; next } + /^ --/ { do_print = 0; next } + (do_print == 1) { print } + ' ${1+"$@"} + else + LC_ALL=C awk ' + /'"$am__var_re"'/ { print; do_print = 1; next; } + /^$/ { do_print = 0; next } + /^ [A-Z][A-Z0-9_]* / { do_print = 0; next } + /^ [A-Z][A-Z0-9_]*$/ { do_print = 0; next } + (do_print == 1) { print } + ' ${1+"$@"} + fi +} + +# grep_configure_help { --OPTION | VARIABLE-NAME } REGEXP +# ------------------------------------------------------- +# Grep the section of "./configure --help" output associated with either +# --OPTION or VARIABLE-NAME for the given *extended* regular expression. +grep_configure_help () +{ + ./configure --help > am--all-help \ + || { cat am--all-help; Exit 1; } + cat am--all-help + extract_configure_help "$1" am--all-help > am--our-help \ + || { cat am--our-help; Exit 1; } + cat am--our-help + $EGREP "$2" am--our-help || Exit 1 +} + +# using_gmake +# ----------- +# Return success if $MAKE is GNU make, return failure otherwise. +# Caches the result for speed reasons. +using_gmake () +{ + case $am__using_gmake in + yes) + return 0;; + no) + return 1;; + '') + # Use --version AND -v, because SGI Make doesn't fail on --version. + # Also grep for GNU because newer versions of FreeBSD make do + # not complain about --version (they seem to silently ignore it). + if $MAKE --version -v | grep GNU; then + am__using_gmake=yes + return 0 + else + am__using_gmake=no + return 1 + fi;; + *) + fatal_ "invalid value for \$am__using_gmake: '$am__using_gmake'";; + esac +} +am__using_gmake="" # Avoid interferences from the environment. + +# make_can_chain_suffix_rules +# --------------------------- +# Return 0 if $MAKE is a make implementation that can chain suffix rules +# automatically, return 1 otherwise. Caches the result for speed reasons. +make_can_chain_suffix_rules () +{ + if test -z "$am__can_chain_suffix_rules"; then + if using_gmake; then + am__can_chain_suffix_rules=yes + return 0 + else + mkdir am__chain.dir$$ + cd am__chain.dir$$ + unindent > Makefile << 'END' + .SUFFIXES: .u .v .w + .u.v: ; cp $< $@ + .v.w: ; cp $< $@ +END + echo make can chain suffix rules > foo.u + if $MAKE foo.w && diff foo.u foo.w; then + am__can_chain_suffix_rules=yes + else + am__can_chain_suffix_rules=no + fi + cd .. + rm -rf am__chain.dir$$ + fi + fi + case $am__can_chain_suffix_rules in + yes) return 0;; + no) return 1;; + *) fatal_ "make_can_chain_suffix_rules: internal error";; + esac +} +am__can_chain_suffix_rules="" # Avoid interferences from the environment. + +# useless_vpath_rebuild +# --------------------- +# Tell whether $MAKE suffers of the bug triggering automake bug#7884. +# For example, this happens with FreeBSD make, since in a VPATH build +# it tends to rebuilt files for which there is an explicit or even just +# a suffix rule, even if said files are already available in the VPATH +# directory. +useless_vpath_rebuild () +{ + if test -z "$am__useless_vpath_rebuild"; then + if using_gmake; then + am__useless_vpath_rebuild=no + return 1 + fi + mkdir am__vpath.dir$$ + cd am__vpath.dir$$ + touch foo.a foo.b bar baz + mkdir build + cd build + unindent > Makefile << 'END' + .SUFFIXES: .a .b + VPATH = .. + all: foo.b baz + .PHONY: all + .a.b: ; cp $< $@ + baz: bar ; cp ../baz bar +END + if $MAKE all && test ! -f foo.b && test ! -f bar; then + am__useless_vpath_rebuild=no + else + am__useless_vpath_rebuild=yes + fi + cd ../.. + rm -rf am__vpath.dir$$ + fi + case $am__useless_vpath_rebuild in + yes) return 0;; + no) return 1;; + "") ;; + *) fatal_ "no_useless_builddir_remake: internal error";; + esac +} +am__useless_vpath_rebuild="" + +yl_distcheck () { useless_vpath_rebuild || $MAKE distcheck ${1+"$@"}; } + +# seq_ - print a sequence of numbers +# ---------------------------------- +# This function simulates GNU seq(1) portably. Valid usages: +# - seq LAST +# - seq FIRST LAST +# - seq FIRST INCREMENT LAST +seq_ () +{ + case $# in + 0) fatal_ "seq_: missing argument";; + 1) seq_first=1 seq_incr=1 seq_last=$1;; + 2) seq_first=$1 seq_incr=1 seq_last=$2;; + 3) seq_first=$1 seq_incr=$2 seq_last=$3;; + *) fatal_ "seq_: too many arguments";; + esac + i=$seq_first + while test $i -le $seq_last; do + echo $i + i=$(($i + $seq_incr)) + done +} + +# rm_rf_ [FILES OR DIRECTORIES ...] +# --------------------------------- +# Recursively remove the given files or directory, also handling the case +# of non-writable subdirectories. +rm_rf_ () +{ + test $# -gt 0 || return 0 + # Ignore failures in find, we are only interested in failures of the + # final rm. + find "$@" -type d ! -perm -700 -exec chmod u+rwx {} \; || : + rm -rf "$@" +} + +# count_test_results total=N pass=N fail=N xpass=N xfail=N skip=N error=N +# ----------------------------------------------------------------------- +# Check that a testsuite run driven by the parallel-tests harness has +# had the specified numbers of test results (specified by kind). +# This function assumes that the output of "make check" or "make recheck" +# has been saved in the 'stdout' file in the current directory, and its +# log in the 'test-suite.log' file. +count_test_results () +{ + # Use a subshell so that we won't pollute the script namespace. + ( + # TODO: Do proper checks on the arguments? + total=ERR pass=ERR fail=ERR xpass=ERR xfail=ERR skip=ERR error=ERR + eval "$@" + # For debugging. + $EGREP -i '(total|x?pass|x?fail|skip|error)' stdout || : + rc=0 + # Avoid spurious failures with shells with "overly sensible" + # errexit shell flag, such as e.g., Solaris /bin/sh. + set +e + test $(grep -c '^PASS:' stdout) -eq $pass || rc=1 + test $(grep -c '^XFAIL:' stdout) -eq $xfail || rc=1 + test $(grep -c '^SKIP:' stdout) -eq $skip || rc=1 + test $(grep -c '^FAIL:' stdout) -eq $fail || rc=1 + test $(grep -c '^XPASS:' stdout) -eq $xpass || rc=1 + test $(grep -c '^ERROR:' stdout) -eq $error || rc=1 + grep "^# TOTAL: *$total$" stdout || rc=1 + grep "^# PASS: *$pass$" stdout || rc=1 + grep "^# XFAIL: *$xfail$" stdout || rc=1 + grep "^# SKIP: *$skip$" stdout || rc=1 + grep "^# FAIL: *$fail$" stdout || rc=1 + grep "^# XPASS: *$xpass$" stdout || rc=1 + grep "^# ERROR: *$error$" stdout || rc=1 + test $rc -eq 0 + ) +} + +commented_sed_unindent_prog=' + /^$/b # Nothing to do for empty lines. + x # Get x into pattern space. + /^$/{ # No prior x, go prepare it. + g # Copy this 1st non-blank line into pattern space. + s/^\(['"$tab"' ]*\).*/x\1/ # Prepare x in pattern space. + } # Now: x in pattern and in hold. + G # Build x\n in pattern space, and + h # duplicate it into hold space. + s/\n.*$// # Restore x in pattern space, and + x # exchange with the above duplicate in hold space. + s/^x\(.*\)\n\1// # Remove leading from . + s/^x.*\n// # Restore when there is no leading . +' + +# unindent [input files...] +# ------------------------- +# Remove the "proper" amount of leading whitespace from the given files, +# and output the result on stdout. That amount is determined by looking +# at the leading whitespace of the first non-blank line in the input +# files. If no input file is specified, standard input is implied. +unindent () +{ + if test x"$sed_unindent_prog" = x; then + sed_unindent_prog=$(printf '%s\n' "$commented_sed_unindent_prog" \ + | sed -e "s/ *# .*//") + fi + sed "$sed_unindent_prog" ${1+"$@"} +} +sed_unindent_prog="" # Avoid interferences from the environment. + +# get_shell_script SCRIPT-NAME +# ----------------------------- +# Fetch an Automake-provided shell script from the 'lib/' directory into +# the current directory, and, if the '$am_test_prefer_config_shell' +# variable is set to "yes", modify its shebang line to use $SHELL instead +# of /bin/sh. +get_shell_script () +{ + test ! -f "$1" || rm -f "$1" || return 99 + if test x"$am_test_prefer_config_shell" = x"yes"; then + sed "1s|#!.*|#! $SHELL|" "$am_scriptdir/$1" > "$1" \ + && chmod a+x "$1" \ + || return 99 + else + cp -f "$am_scriptdir/$1" . || return 99 + fi + sed 10q "$1" # For debugging. +} + +# require_xsi SHELL +# ----------------- +# Skip the test if the given shell fails to support common XSI constructs. +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_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. +xsi_shell_code=' + _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ + && eval '\''test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5'\' + +# fetch_tap_driver +# ---------------- +# Fetch the Automake-provided TAP driver from the 'lib/' directory into +# the current directory, and edit its shebang line so that it will be +# run with the perl interpreter determined at configure time. +fetch_tap_driver () +{ + # TODO: we should devise a way to make the shell TAP driver tested also + # TODO: with /bin/sh, for better coverage. + case $am_tap_implementation in + perl) + $PERL -MTAP::Parser -e 1 \ + || skip_all_ "cannot import TAP::Parser perl module" + sed "1s|#!.*|#! $PERL -w|" "$am_scriptdir"/tap-driver.pl >tap-driver + ;; + shell) + AM_TAP_AWK=$AWK; export AM_TAP_AWK + sed "1s|#!.*|#! $SHELL|" "$am_scriptdir"/tap-driver.sh >tap-driver + ;; + *) + fatal_ "invalid \$am_tap_implementation '$am_tap_implementation'" ;; + esac \ + && chmod a+x tap-driver \ + || framework_failure_ "couldn't fetch $am_tap_implementation TAP driver" + sed 10q tap-driver # For debugging. +} +# The shell/awk implementation of the TAP driver is still mostly dummy, so +# use the perl implementation by default for the moment. +am_tap_implementation=${am_tap_implementation-shell} + +# Usage: require_compiler_ {cc|c++|fortran|fortran77} +require_compiler_ () +{ + case $# in + 0) fatal_ "require_compiler_: missing argument";; + 1) ;; + *) fatal_ "require_compiler_: too many arguments";; + esac + case $1 in + cc) + am__comp_lang="C" + am__comp_var=CC + am__comp_flag_vars='CFLAGS CPPFLAGS' + ;; + c++) + am__comp_lang="C++" + am__comp_var=CXX + am__comp_flag_vars='CXXFLAGS CPPFLAGS' + ;; + fortran) + am__comp_lang="Fortran" + am__comp_var=FC + am__comp_flag_vars='FCFLAGS' + ;; + fortran77) + am__comp_lang="Fortran 77" + am__comp_var=F77 + am__comp_flag_vars='FFLAGS' + ;; + esac + shift + eval "am__comp_prog=\${$am__comp_var}" \ + || fatal_ "expanding \${$am__comp_var} in require_compiler_" + case $am__comp_prog in + "") + fatal_ "botched configuration: \$$am__comp_var is empty";; + false) + skip_all_ "no $am__comp_lang compiler available";; + autodetect|autodetected) + # Let the ./configure commands in the test script try to determine + # these automatically. + unset $am__comp_var $am__comp_flag_vars;; + *) + # Pre-set these for the ./configure commands in the test script. + export $am__comp_var $am__comp_flag_vars;; + esac + # Delete private variables. + unset am__comp_lang am__comp_prog am__comp_var am__comp_flag_vars +} + +## ----------------------------------------------------------- ## +## Checks for required tools, and additional setups (if any) ## +## required by them. ## +## ----------------------------------------------------------- ## + +# Performance tests must be enabled explicitly. +case $argv0 in + */perf/*) + case $AM_TESTSUITE_PERF in + [yY]|[yY]es|1) ;; + *) skip_ "performance tests not explicitly enabled" ;; + esac + ;; +esac + +# Look for (and maybe set up) required tools and/or system features; skip +# the current test if they are not found. +for tool in : $required +do + # Check that each required tool is present. + case $tool in + :) ;; + cc|c++|fortran|fortran77) + require_compiler_ $tool;; + xsi-lib-shell) + if test x"$am_test_prefer_config_shell" = x"yes"; then + require_xsi "$SHELL" + else + require_xsi "/bin/sh" + fi + ;; + bzip2) + # 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" + ;; + cl) + CC=cl + # Don't export CFLAGS, as that could have been initialized to only + # work with the C compiler detected at configure time. If the user + # wants CFLAGS to also influence 'cl', he can still export CFLAGS + # in the environment "by hand" before calling the testsuite. + export CC CPPFLAGS + echo "$me: running $CC -?" + $CC -? || skip_all_ "Microsoft C compiler '$CC' not available" + ;; + etags) + # Exuberant Ctags will create a TAGS file even + # when asked for --help or --version. (Emacs's etags + # does not have such problem.) Use -o /dev/null + # to make sure we do not pollute the build directory. + echo "$me: running etags --version -o /dev/null" + etags --version -o /dev/null \ + || skip_all_ "required program 'etags' not available" + ;; + GNUmake) + for make_ in "$MAKE" gmake gnumake :; do + MAKE=$make_ am__using_gmake='' + test "$MAKE" = : && break + echo "$me: determine whether $MAKE is GNU make" + using_gmake && break + : For shells with busted 'set -e'. + done + test "$MAKE" = : && skip_all_ "this test requires GNU make" + export MAKE + unset make_ + ;; + gcj) + GCJ=$GNU_GCJ GCJFLAGS=$GNU_GCJFLAGS; export GCJ GCJFLAGS + test "$GCJ" = false && skip_all_ "GNU Java compiler unavailable" + : For shells with busted 'set -e'. + ;; + gcc) + CC=$GNU_CC CFLAGS=$GNU_CFLAGS; export CC CFLAGS CPPFLAGS + test "$CC" = false && skip_all_ "GNU C compiler unavailable" + : For shells with busted 'set -e'. + ;; + g++) + CXX=$GNU_CXX CXXFLAGS=$GNU_CXXFLAGS; export CXX CXXFLAGS CPPFLAGS + test "$CXX" = false && skip_all_ "GNU C++ compiler unavailable" + : For shells with busted 'set -e'. + ;; + gfortran) + FC=$GNU_FC FCFLAGS=$GNU_FCFLAGS; export FC FCFLAGS + test "$FC" = false && skip_all_ "GNU Fortran compiler unavailable" + case " $required " in + *\ g77\ *) ;; + *) F77=$FC FFLAGS=$FCFLAGS; export F77 FFLAGS;; + esac + ;; + g77) + F77=$GNU_F77 FFLAGS=$GNU_FFLAGS; export F77 FFLAGS + test "$F77" = false && skip_all_ "GNU Fortran 77 compiler unavailable" + case " $required " in + *\ gfortran\ *) ;; + *) FC=$F77 FCFLAGS=$FFLAGS; export FC FCFLAGS;; + esac + ;; + javac) + # The Java compiler from JDK 1.5 (and presumably earlier versions) + # cannot handle the '-version' option by itself: it bails out + # 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_all_ "Sun Java compiler not available" + ;; + java) + # See the comments above about 'javac' for why we use also '-help'. + echo "$me: running java -version -help" + java -version -help || skip_all_ "Sun Java interpreter not found" + ;; + lib) + AR=lib + export AR + # Attempting to create an empty archive will actually not + # create the archive, but lib will output its version. + echo "$me: running $AR -out:defstest.lib" + $AR -out:defstest.lib \ + || skip_all_ "Microsoft 'lib' utility not available" + ;; + makedepend) + echo "$me: running makedepend -f-" + makedepend -f- \ + || 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_all_ "cannot find a makeinfo program that groks" \ + "the '--html' option" + ;; + mingw) + uname_s=$(uname -s || echo UNKNOWN) + echo "$me: system name: $uname_s" + case $uname_s in + MINGW*) ;; + *) skip_all_ "this test requires MSYS in MinGW mode" ;; + esac + unset uname_s + ;; + non-root) + # Skip this test case if the user is root. + # We try to append to a read-only file to detect this. + priv_check_temp=priv-check.$$ + touch $priv_check_temp && chmod a-w $priv_check_temp \ + || framework_failure_ "creating unwritable file $priv_check_temp" + # Not a useless use of subshell: lesser shells like Solaris /bin/sh + # can exit if a builtin fails. + overwrite_status=0 + (echo foo >> $priv_check_temp) || overwrite_status=$? + rm -f $priv_check_temp + if test $overwrite_status -eq 0; then + skip_all_ "cannot drop file write permissions" + fi + unset priv_check_temp overwrite_status + ;; + perl-threads) + if test "$WANT_NO_THREADS" = "yes"; then + skip_all_ "Devel::Cover cannot cope with threads" + fi + ;; + native) + # Don't use "&&" here, to avoid a bug of 'set -e' present in + # some (even relatively recent) versions of the BSD shell. + # We add the dummy "else" branch for extra safety. + ! 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_all_ "python interpreter not available" + ;; + ro-dir) + # Skip this test case if read-only directories aren't supported + # (e.g., under DOS.) + ro_dir_temp=ro_dir.$$ + mkdir $ro_dir_temp && chmod a-w $ro_dir_temp \ + || framework_failure_ "creating unwritable directory $ro_dir_temp" + # Not a useless use of subshell: lesser shells like Solaris /bin/sh + # can exit if a builtin fails. + create_status=0 + (: > $ro_dir_temp/probe) || create_status=$? + rm -rf $ro_dir_temp + if test $create_status -eq 0; then + skip_all_ "cannot drop directory write permissions" + fi + unset ro_dir_temp create_status + ;; + runtest) + # DejaGnu's runtest program. We rely on being able to specify + # the program on the runtest command-line. This requires + # DejaGnu 1.4.3 or later. + echo "$me: running runtest SOMEPROGRAM=someprogram --version" + runtest SOMEPROGRAM=someprogram --version \ + || 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_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_all_ "required program 'texi2dvi' not available" + ;; + lex) + test x"$LEX" = x"false" && skip_all_ "lex not found or disabled" + export LEX + ;; + yacc) + test x"$YACC" = x"false" && skip_all_ "yacc not found or disabled" + export YACC + ;; + flex) + LEX=flex; export LEX + echo "$me: running flex --version" + flex --version || skip_all_ "required program 'flex' not available" + ;; + bison) + YACC='bison -y'; export YACC + echo "$me: running bison --version" + bison --version || skip_all_ "required program 'bison' not available" + ;; + *) + # 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 + # we need the subshell here. Also, some tools, like Sun cscope, + # can be interactive without redirection. + ($tool --version) +trap "trap '' 13; fatal_ 'caught signal SIGPIPE'" 13 + +# Create and populate the temporary directory, if and as required. +if test x"$am_create_testdir" = x"no"; then + testSubDir= +else + # The subdirectory where the current test script will run and write its + # temporary/data files. This will be created shortly, and will be removed + # by the cleanup trap below if the test passes. If the test doesn't pass, + # this directory will be kept, to facilitate debugging. + testSubDir=t/$me.dir + test ! -d $testSubDir || rm_rf_ $testSubDir \ + || framework_failure_ "removing old test subdirectory" + test -d t || mkdir t + mkdir $testSubDir \ + || framework_failure_ "creating test subdirectory" + # The trailing './'ris to avoid CDPATH issues. + cd ./$testSubDir \ + || framework_failure_ "cannot chdir into test subdirectory" + if test x"$am_create_testdir" != x"empty"; then + cp "$am_scriptdir"/install-sh "$am_scriptdir"/missing \ + "$am_scriptdir"/depcomp . \ + || framework_failure_ "fetching common files from $am_scriptdir" + # Build appropriate environment in test directory. E.g., create + # configure.ac, touch all necessary files, etc. Don't use AC_OUTPUT, + # but AC_CONFIG_FILES so that appending still produces a valid + # configure.ac. But then, tests running config.status really need + # to append AC_OUTPUT. + { + echo "AC_INIT([$me], [1.0])" + if test x"$am_serial_tests" = x"yes"; then + echo "AM_INIT_AUTOMAKE" + else + echo "AM_INIT_AUTOMAKE([parallel-tests])" + fi + echo "AC_CONFIG_FILES([Makefile])" + } >configure.ac || framework_failure_ "creating configure.ac skeleton" + fi +fi + + +## ---------------- ## +## Ready to go... ## +## ---------------- ## + +set -x +pwd diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index db7d97b..e16dd1d 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -963,7 +963,6 @@ t/self-check-is_newest.tap \ t/self-check-me.tap \ t/self-check-reexec.tap \ t/self-check-report.sh \ -t/self-check-sanity.sh \ t/self-check-seq.tap \ t/self-check-is-blocked-signal.tap \ t/self-check-tap.sh \ diff --git a/t/self-check-cleanup.tap b/t/self-check-cleanup.tap index f3868e6..01636f4 100755 --- a/t/self-check-cleanup.tap +++ b/t/self-check-cleanup.tap @@ -40,7 +40,7 @@ fi export have_symlinks # Is used also by spawned shells. # Don't let a failure poison all subsequent tests. -do_clean () +do_clean_setup () { # Don't try to be smart and use find here, that has caused issues # and extra ERROR results in the past. Be dumb and safe. @@ -48,8 +48,12 @@ do_clean () test ! -d $d || chmod u+rwx $d || : done rm -rf t + mkdir -p t/ax + cp "$am_top_builddir"/t/ax/test-init.sh t/ax } +do_clean_setup + # Exporting 'keep_testdirs' to "yes" in the environment should cause # the cleanup code not to be run, so that the temporary directories # are left on disk. @@ -59,11 +63,11 @@ command_ok_ '"keep_testdirs=yes" causes testdir to be kept around' eval ' && test -f t/dummy.dir/foo \ && test okok = $(cat t/dummy.dir/foo)' -do_clean +do_clean_setup # Check that pre-test cleanup works also with directories with # "null" permissions, and containing broken symlinks. -mkdir t t/dummy.dir t/dummy.dir/sub +mkdir t/dummy.dir t/dummy.dir/sub ( cd t/dummy.dir touch file sub/file @@ -82,7 +86,7 @@ command_ok_ "pre-cleanup removed low-perms testdir" \ && test ! -d t/dummy.dir \ && test ! -r t/dummy.dir' -do_clean +do_clean_setup # Check that post-test cleanup works also with directories with # "null" permissions, and containing broken symlinks. @@ -109,7 +113,7 @@ command_ok_ "post-cleanup removed null-perms testdir" \ && test ! -d t/dummy.dir \ && test ! -r t/dummy.dir' -do_clean +do_clean_setup # Check that pre-test cleanup does not unduly change the permissions of # files to which symlinks in the temporary test directory point to. @@ -120,7 +124,7 @@ if test $have_symlinks = yes; then : > file chmod 000 file - mkdir t t/dummy.dir + mkdir t/dummy.dir (cd t/dummy.dir && ln -s ../../dir ../../file .) command_ok_ "pre-cleanup with testdir with zero-perms symlinks" \ @@ -152,7 +156,7 @@ else # $have_symlinks = no skip_row_ 6 "symlinks not supported" fi -do_clean +do_clean_setup # Check that the cleanup trap does not remove the temporary # test directory in case of test failure, skip, hard-error, @@ -168,7 +172,7 @@ for st in 1 2 3 10 77 99 126 127 130 255; do " t/dummy.sh command_ok_ "testdir not removed if exiting with status $st" \ test -f t/dummy.dir/foo - do_clean + do_clean_setup done for sig in 1 2 3 9 13 15; do @@ -185,7 +189,7 @@ for sig in 1 2 3 9 13 15; do " t/dummy.sh command_ok_ "testdir not removed if getting signal $sig" \ test -f t/dummy.dir/foo - do_clean + do_clean_setup done : diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh index 6fff27e..ffab44d 100755 --- a/t/self-check-explicit-skips.sh +++ b/t/self-check-explicit-skips.sh @@ -15,43 +15,41 @@ # along with this program. If not, see . # Sanity check for the automake testsuite. -# Check creation/removal of temporary test working directory by './defs'. +# Check that our testsuite framework can be instructed not to consider +# an early exit due to some command exiting unexpectedly with status 77. -am_create_testdir=empty +am_create_testdir=no . ./defs || Exit 1 -# We still need a little hack to make ./defs work outside automake's -# tree 'tests' subdirectory. Not a big deal. -sed "s|^am_top_builddir=.*|am_top_builddir='$(pwd)'|" \ - "$am_top_builddir"/defs-static > defs-static -diff "$am_top_builddir"/defs-static defs-static \ - && fatal_ "failed to edit defs-static" -cp "$am_top_builddir"/defs . - set +e unset am_explicit_skips stderr_fileno_ AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC -# I'm a lazy typist. -sh=$AM_TEST_RUNNER_SHELL +# FIXME: this can be simplified when we improve our runtime checks on the +# testsuite shell to ensure it supports "VAR=val shell_func" correctly. +run_dummy_test () +{ + env $2 $AM_TEST_RUNNER_SHELL -c "am_create_testdir=no; . ./defs; $1" \ + dummy.sh +} -$sh -c '. ./defs; (exit 77); exit 77' dummy.test +run_dummy_test '(exit 77); exit 77' test $? -eq 77 || Exit 1 -am_explicit_skips=no $sh -c '. ./defs; sh -c "exit 77"' dummy.test +run_dummy_test 'sh -c "exit 77"' am_explicit_skips=no test $? -eq 77 || Exit 1 -am_explicit_skips=yes $sh -c '. ./defs; (exit 77); exit 77' dummy.test +run_dummy_test '(exit 77); exit 77' am_explicit_skips=yes test $? -eq 78 || Exit 1 -am_explicit_skips=y $sh -c '. ./defs; sh -c "exit 77"' dummy.test +run_dummy_test 'sh -c "exit 77"' am_explicit_skips=y test $? -eq 78 || Exit 1 -am_explicit_skips=yes $sh -c '. ./defs; Exit 77' dummy.test +run_dummy_test 'Exit 77' am_explicit_skips=yes test $? -eq 77 || Exit 1 -am_explicit_skips=y $sh -c '. ./defs; skip_ "foo"' dummy.test +run_dummy_test 'skip_ "foo"' am_explicit_skips=y test $? -eq 77 || Exit 1 : diff --git a/t/self-check-reexec.tap b/t/self-check-reexec.tap index 63d3d09..3a4bcda 100755 --- a/t/self-check-reexec.tap +++ b/t/self-check-reexec.tap @@ -25,7 +25,15 @@ plan_ 32 unset AM_TESTS_REEXEC BASH_VERSION || : +get_test_init_sh () +{ + mkdir -p ${1-.}/t/ax + cp "$am_top_builddir"/t/ax/test-init.sh ${1-.}/t/ax \ + || fatal_ "fetching 't/ax/test-init.sh' from top_builddir" +} + cwd=$(pwd) || fatal_ "getting current working directory" +get_test_init_sh cp "$am_top_builddir"/defs . || fatal_ "fetching 'defs' from top_builddir" # @@ -165,6 +173,7 @@ sed -e "s|^am_top_builddir=.*|am_top_builddir='$cwd'|" \ < "$am_top_builddir"/defs-static > defs-static sed -e "s|^am_top_builddir=.*|am_top_builddir='$cwd/sub'|" \ < "$am_top_builddir"/defs-static > sub/defs-static +get_test_init_sh sub check_preserve_args () { @@ -179,13 +188,13 @@ check_reexec_message () dir=$1; shift get_ddata "$dir" $sh "${dir}${dsep}dummy.sh" "$@" \ - | grep "^dummy: exec $AM_TEST_RUNNER_SHELL ${dir}${dsep}dummy\\.sh $*\$" \ + | grep "^exec $AM_TEST_RUNNER_SHELL ${dir}${dsep}dummy\\.sh $*\$" \ && r='ok' || r='not ok' result_ "$r" "$sh display re-exec message [$dname] [args: $*]" } ./dummy.sh a b \ - | grep "^dummy: exec $AM_TEST_RUNNER_SHELL \\./dummy\\.sh a b$" \ + | grep "^exec $AM_TEST_RUNNER_SHELL \\./dummy\\.sh a b$" \ && r='ok' || r='not ok' result_ "$r" "direct run display re-exec message [args: a b]" diff --git a/t/self-check-sanity.sh b/t/self-check-sanity.sh deleted file mode 100755 index 508f0c7..0000000 --- a/t/self-check-sanity.sh +++ /dev/null @@ -1,77 +0,0 @@ -#! /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 . - -# Sanity check for the automake testsuite. -# Test the sanity checks performed by the 'defs' script. Also check -# that we can use 'defs' elsewhere, when we duplicate some of the -# infrastructure from the automake/tests subdirectory. - -am_create_testdir=empty -. ./defs || Exit 1 - -# Avoid to confuse traces from child processed with our own traces. -show_stderr () -{ - sed 's/^/ | /' stderr >&2 -} - -AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC - -source_defs=". '$am_top_builddir/defs'" - -if $AM_TEST_RUNNER_SHELL -c "$source_defs" dummy.sh 2>stderr; then - show_stderr - Exit 1 -else - show_stderr - grep 'defs-static: not found in current directory' stderr -fi - -sed 's|^am_top_srcdir=.*|am_top_srcdir=foo|' \ - "$am_top_builddir"/defs-static > defs-static -if $AM_TEST_RUNNER_SHELL -c "$source_defs" t/dummy.sh 2>stderr; then - show_stderr - Exit 1 -else - show_stderr - grep 'foo/defs-static\.in not found.*check \$am_top_srcdir' stderr -fi - -sed 's|^am_top_builddir=.*|am_top_builddir=foo|' \ - "$am_top_builddir"/defs-static > defs-static -if $AM_TEST_RUNNER_SHELL -c "$source_defs" t/dummy.sh 2>stderr; then - show_stderr - Exit 1 -else - show_stderr - grep 'foo/defs-static not found.*check \$am_top_builddir' stderr -fi - -# We still need a little hack to make ./defs work outside automake's -# tree 'tests' subdirectory. Not a big deal. -sed "s|^am_top_builddir=.*|am_top_builddir='$(pwd)'|" \ - "$am_top_builddir"/defs-static > defs-static -# Redefining *srcdir and *builddir variables in the environment shouldn't -# cause problems -env \ - builddir=bad-dir srcdir=bad-dir \ - top_builddir=bad-dir top_srcdir=bad-dir \ - abs_builddir=bad-dir abs_srcdir=bad-dir \ - abs_top_builddir=bad-dir abs_top_srcdir=bad-dir \ - $AM_TEST_RUNNER_SHELL -c "$source_defs && echo '!OK!' > ../foo" t/dummy.sh -$FGREP '!OK!' t/foo - -: -- 2.7.4