From: Stefano Lattarini Date: Fri, 22 Jun 2012 12:52:21 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: v1.12b~114 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=062aeb245e68208dccb3ccc9b28e100a81dbc79b;p=thirdparty%2Fautomake.git Merge branch 'maint' * maint: tests: automatic re-execution works for non-POSIX shells too tests: use more POSIX shell features our test scripts + Extra non-trivial edits: * t/ax/test-init.sh: Apply the diffs between past versions of 'defs' in maint and in master; i.e., remove handling of $required entries 'texi2dvi-o' and 'makeinfo-html', and adjust to the fact that the parallel testsuite harness is now the default. Signed-off-by: Stefano Lattarini --- 062aeb245e68208dccb3ccc9b28e100a81dbc79b diff --cc defs index 0b01f5991,559eea049..bef8b2305 --- a/defs +++ b/defs @@@ -105,638 -54,11 +54,11 @@@ case ${AM_TESTS_REEXEC-yes} i *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 - # Try to avoid forks if possible. - case "$BASH_VERSION" in - ""|[12].*) - : Not bash, or a too old bash version. ;; - *) - # Use eval to protect dumber shells from parsing errors. - eval 'for ((i = seq_first; i <= seq_last; i += seq_incr)); do - echo $i - done' - return 0;; - esac - # Else, use GNU seq if available. - seq "$@" && return 0 - # Otherwise revert to a slower loop using expr(1). - i=$seq_first - while test $i -le $seq_last; do - echo $i - i=`expr $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. ++ # 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 diff --cc t/aclocal-print-acdir.sh index 53ad5561e,ef61b2f62..6e8aa0983 --- a/t/aclocal-print-acdir.sh +++ b/t/aclocal-print-acdir.sh @@@ -20,12 -20,15 +20,12 @@@ am_create_testdir=empt . ./defs || Exit 1 $ACLOCAL --print-ac-dir - test "`$ACLOCAL --print-ac-dir`" = "$am_system_acdir" + test "$($ACLOCAL --print-ac-dir)" = "$am_system_acdir" -$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir -test "$($ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir)" = foo - $ACLOCAL --system-acdir /bar --print-ac-dir - test "`$ACLOCAL --system-acdir /bar --print-ac-dir`" = /bar + test "$($ACLOCAL --system-acdir /bar --print-ac-dir)" = /bar $ACLOCAL --automake-acdir /bar --print-ac-dir - test "`$ACLOCAL --automake-acdir /bar --print-ac-dir`" = "$am_system_acdir" + test "$($ACLOCAL --automake-acdir /bar --print-ac-dir)" = "$am_system_acdir" : diff --cc t/ax/test-init.sh index 000000000,fe28f9a17..b4c8e4d0d mode 000000,100644..100644 --- a/t/ax/test-init.sh +++ b/t/ax/test-init.sh @@@ -1,0 -1,1052 +1,1039 @@@ + # -*- 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" ++ echo "AM_INIT_AUTOMAKE([serial-tests])" + else - echo "AM_INIT_AUTOMAKE([parallel-tests])" ++ echo "AM_INIT_AUTOMAKE" + fi + echo "AC_CONFIG_FILES([Makefile])" + } >configure.ac || framework_failure_ "creating configure.ac skeleton" + fi + fi + + + ## ---------------- ## + ## Ready to go... ## + ## ---------------- ## + + set -x + pwd diff --cc t/distcom4.sh index 6f9d8716c,32d3db2ac..b785fecbb --- a/t/distcom4.sh +++ b/t/distcom4.sh @@@ -68,7 -69,9 +68,7 @@@ sed -n -e '/^DIST_COMMON =.*\\$/ cat dc.txt # For debugging. - test 1 = `grep tests dc.txt | wc -l` + test 1 -eq $(grep -c tests dc.txt) grep configure dc.txt -# README must come first. -grep 'DIST_COMMON = README' Makefile.in : diff --cc t/gettext-macros.sh index e9a4739e1,e424a8ec0..b1349f6b2 --- a/t/gettext-macros.sh +++ b/t/gettext-macros.sh @@@ -61,7 -61,10 +61,7 @@@ AM_GNU_GETTEX AM_GNU_GETTEXT_VERSION([$autopoint_version]) END - if $am_gettextize_command --force && test -f m4/gettext.m4; then :; else -if $am_gettextize_command --force && test -f m4/gettext.m4; then - echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh - echo "export ACLOCAL_PATH" >> get.sh -else ++if ! ($am_gettextize_command --force && test -f m4/gettext.m4); then # Older versions of gettext might not have a gettextize program # available, but this doesn't mean the user hasn't made the gettext # macros available, e.g., by properly setting ACLOCAL_PATH. @@@ -75,14 -78,14 +75,14 @@@ fi fi - echo "ACLOCAL_PATH='`pwd`/m4':\$ACLOCAL_PATH" >> get.sh -. ./get.sh ++echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh +echo "export ACLOCAL_PATH" >> get.sh -cat >> get.sh <<'END' # Even recent versions of gettext used the now-obsolete 'AM_PROG_MKDIR_P' # m4 macro. So we need the following to avoid spurious errors. -ACLOCAL="$ACLOCAL -Wno-obsolete" -AUTOMAKE="$AUTOMAKE -Wno-obsolete" -END +echo 'AC_DEFUN([AM_MKDIR_P], [AC_MKDIR_P([$@])])' >> m4/mk-dirp.m4 + +. ./get.sh $ACLOCAL --force -I m4 || cat >> get.sh <<'END' # We need to use '-Wno-syntax', since we do not want our test suite diff --cc t/help-silent.sh index aaa6b6a6c,2be4fefc0..dbf45a095 --- a/t/help-silent.sh +++ b/t/help-silent.sh @@@ -19,22 -19,23 +19,20 @@@ . ./defs || Exit 1 -cat > configure.ac < Makefile.am $ACLOCAL -mv -f configure.ac configure.tmpl +cp configure.ac configure.tmpl - q="[\`'\"]" - -for args in '' '([])' '([yes])' '([no])'; do - sed "s/AM_SILENT_RULES.*/&$args/" configure.tmpl >configure.ac - cat configure.ac +for args in '' 'yes' 'no'; do + cp -f configure.tmpl configure.ac + test x"$args" = x || echo "AM_SILENT_RULES([$args])/" >> configure.ac + cat configure.ac # For debugging. $AUTOCONF --force grep_configure_help --enable-silent-rules \ - " less verbose build.*\\(undo.*${q}make V=1${q}" + ' less verbose build.*\(undo.*"make V=1".*\)' grep_configure_help --disable-silent-rules \ - " verbose build.*\\(undo.*${q}make V=0${q}" + ' verbose build.*\(undo.*"make V=0".*\)' done : diff --cc t/test-driver-is-distributed.sh index 88f7982e8,12f9c0b9d..73ce8405d --- a/t/test-driver-is-distributed.sh +++ b/t/test-driver-is-distributed.sh @@@ -21,19 -21,18 +21,19 @@@ am_create_testdir=empty . ./defs || Exit 1 - ocwd=`pwd` || fatal_ "getting current working directory" + ocwd=$(pwd) || fatal_ "getting current working directory" -do_check () -{ - whereopts=$1 auxdir=$2 - case $#,$whereopts in - 2,ac) ac_opts=parallel-tests am_code= ;; - 2,am) am_opts=parallel-tests ac_code= ;; - *) fatal_ "do_check: bad usage";; - esac - mkdir $whereopts - cd $whereopts +for i in 1 2; do + mkdir D$i + cd D$i + if test $i -eq 1; then + auxdir=. + test_driver=test-driver + else + auxdir=build-aux + test_driver=$auxdir/test-driver + mkdir $auxdir + fi mkdir tests unindent > configure.ac << END AC_INIT([$me], [1.0]) diff --cc t/vtexi4.sh index bba1b5a67,27b0636f7..ee9d0786d --- a/t/vtexi4.sh +++ b/t/vtexi4.sh @@@ -21,19 -21,15 +21,15 @@@ # for more vers*.texi files, and does not require makeinfo, tex and # texi2dvi. -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' . ./defs || Exit 1 - case `LC_ALL=C date '+%u'` in - [1-7]) date_is_posix=:;; - *) date_is_posx=false;; - esac - $date_is_posix \ - && day=`LC_ALL=C date '+%d'` && test -n "$day" \ - && month=`LC_ALL=C date '+%B'` && test -n "$month" \ - && year=`LC_ALL=C date '+%Y'`&& test -n "$year" \ + test $(LC_ALL=C date '+%u') -gt 0 && test $(LC_ALL=C date '+%u') -lt 8 \ + && day=$(LC_ALL=C date '+%d') && test -n "$day" \ + && month=$(LC_ALL=C date '+%B') && test -n "$month" \ + && year=$(LC_ALL=C date '+%Y') && test -n "$year" \ || skip_ "'date' is not POSIX-compliant enough" - day=`echo "$day" | sed 's/^0//'` + day=$(echo "$day" | sed 's/^0//') (echo 'x' | grep x) \ || skip_ "grep doesn't work on input that is not pure text"