From: Stefano Lattarini Date: Wed, 4 May 2011 20:21:53 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~184 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ab2e466557486162d83f9682c035f434a26bdac;p=thirdparty%2Fautomake.git Merge branch 'maint' With some edits to `tests/defs' and `ChangeLog', to reflect the fact that in master we already had a `yacc' requirement, and no more had an explicitly-recognized `bison' requirement. --- 0ab2e466557486162d83f9682c035f434a26bdac diff --cc ChangeLog index bfd90cd94,3d87b6bca..77ec72b0f --- a/ChangeLog +++ b/ChangeLog @@@ -1,52 -1,20 +1,67 @@@ + 2011-05-04 Stefano Lattarini + + tests defs: allow requirements for compilers (mostly dummy) + Most of the new requirements that are now accepted in `$required' + as consequence of this patch are still dummy. They are planned + to be implemented only in master (or in some derived branch), but + having them here (even just as no-op) will allow for an easier + integration/backporting of potential new testcases. + * tests/defs.in (cc, c++, fortran, fortran77): New requirements, + still dummy. + (flex): New requirement, picking LEX for configure. + (lex): New requirement, alias for `flex'. A more appropriate + implementation, looking for a generic `lex' program, will follow + in the future. - (yacc): New requirement, alias for `bison'. A more appropriate - implementation, looking for a generic `yacc' program, will follow - in the future. ++ +2011-05-03 Stefano Lattarini + + tests: add forgotten test scripts to $(TESTS) + * tests/Makefile.am (TESTS): Added test scripts man[678].test, + which have been present on the filesystem and in the repository, + but which had erroneously been left out from $(TESTS). + +2011-05-03 Stefano Lattarini + + tests: ensure verbose printing of captured make output + * tests/libtool7.test: Ensure verbose printing of captured + make output. + * tests/libtool9.test: Likewise. + +2011-05-03 Stefano Lattarini + + tests: fix spurious failure in 'color2.test' + * tests/color2.test: If $MAKE contains command-line arguments (as + in e.g., "make -j2"), expect's directive "spawn $env(MAKE)" fails + spuriously, because it tries to run "$MAKE" as a single command. + Fix this with proper uses of the TCL `eval' builtin. + +2011-05-01 Stefano Lattarini + + tests: fix self check spurious failure with older bash versions + * tests/self-check-cleanup.test: Add trailing `:' to the test code + passed to $SHELL, otherwise older versions of bash (at least 2.05 + and 3.2.39) fail to correctly remove the temporary directory in + the exit trap. + +2011-04-29 Stefano Lattarini + + testsuite: more environment sanitization + * tests/defs: Move the checks verifying that the variables `me', + `parallel_tests' and `required' aren't set in the environment ... + * tests/defs-static.in: ... in here, with some optimizations to + avoid useless forks. Also, do the same checks for the variables + `original_AUTOMAKE' and `original_ACLOCAL' too. + * tests/self-check-env-sanitize.test: Update. + * tests/Makefile.am (TESTS_ENVIRONMENT): Unset also variables + `original_AUTOMAKE' and `original_ACLOCAL'. + +2011-04-24 Stefano Lattarini + + tests: fix spurious failure (non-renamed AM_TESTS_SETUP usage) + * tests/parallel-tests-reset-term.test: Use AM_TESTS_ENVIRONMENT + instead of AM_TESTS_SETUP (which has been removed in commit + v1.11-349-g12f48fa). + Fix spurious failure introduced by merge `v1.11-781-gfeed175'. 2011-04-24 Stefano Lattarini diff --cc tests/defs index 46ff08b2e,8f9534ef3..6ee183017 --- a/tests/defs +++ b/tests/defs @@@ -238,6 -153,23 +238,9 @@@ d # Check that each required tool is present. case $tool in :) ;; - bison|yacc) - # Since bison is required, we pick YACC for ./configure. - YACC='bison -y' - export YACC - echo "$me: running bison --version" - ( bison --version ) || exit 77 - ;; - flex|lex) - # Since flex is required, we pick LEX for ./configure. - LEX=flex - export LEX - echo "$me: running flex --version" - flex --version || exit 77 - ;; + cc|c++|fortran|fortran77) + echo "$me: dummy requirement '$tool', no check done" + ;; bzip2) # Do not use --version, bzip2 still tries to compress stdin. echo "$me: running bzip2 --help" @@@ -392,40 -292,11 +395,47 @@@ texi2dvi-o) # Texi2dvi supports `-o' since Texinfo 4.1. echo "$me: running texi2dvi -o /dev/null --version" - ( texi2dvi -o /dev/null --version ) || exit 77 + texi2dvi -o /dev/null --version || exit 77 + ;; + xsi-shell) + # Try some XSI features. + # Keep this in sync with libtool.m4:_LT_CHECK_SHELL_FEATURES. + echo "$me: trying some XSI constructs" + ( _am_dummy="a/b/c" + test "${_am_dummy##*/},${_am_dummy%/*},${_am_dummy#??}"${_am_dummy%"$_am_dummy"}, \ + = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_am_dummy}" -eq 5' ) || exit 77 + ;; ++ flex|lex) ++ # Since flex is required, we pick LEX for ./configure. ++ LEX=flex ++ export LEX ++ echo "$me: running flex --version" ++ flex --version || exit 77 ++ ;; + yacc) + if test x"$YACC" = x"no"; then + # The user has explicitly told he doesn't want a yacc program + # to be used. + echo "$me: \$YACC is \"no\", skipping test" >&2 + exit 77 + elif test -z "$YACC"; then + # The user hasn't explicitly specified any yacc program in the + # environment, so we try to use bison, skipping the test if it's + # not found. + YACC='bison -y' + export YACC + echo "$me: running bison --version" + bison --version || exit 77 + fi ;; - # Generic case: the tool must support --version. *) + # Generic case: the tool must support --version. echo "$me: running $tool --version" + # It is not likely but possible that $tool is a special builtin, + # in which case the shell is allowed to exit after an error. + # So, please leave the subshell here. ( $tool --version ) || exit 77 ;; esac