From: Peter Rosin Date: Tue, 16 Nov 2010 12:08:06 +0000 (+0100) Subject: Merge branch 'msvc' into tests-init X-Git-Tag: ng-0.5a~336^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=206f3bf19c4384591b50888bf0d4859ae985ca6b;p=thirdparty%2Fautomake.git Merge branch 'msvc' into tests-init --- 206f3bf19c4384591b50888bf0d4859ae985ca6b diff --cc ChangeLog index 634a3ed25,7594302fb..7596418b0 --- a/ChangeLog +++ b/ChangeLog @@@ -1,164 -1,18 +1,179 @@@ + 2010-11-16 Peter Rosin + + Skip MSVC oriented tests if the shell is not capable. + * tests/defs: New required entry 'xsi-shell'. + * tests/ar-lib.test, tests/compile3.test, tests/compile6.test: + Require a XSI capable shell. + Reported by Ralf Wildenhues. + + 2010-11-15 Peter Rosin + + compile: clear the `eat' variable earlier. + * lib/compile: Clear the `eat' variable earlier. + ($scriptversion): Update. + * tests/compile3.test: Prevent regressions. + +2010-11-11 Stefano Lattarini + + Tests defs: improve messages for skipped tests. + * tests/defs: Give meaningful messages about the reasons of a + test skip; this is especially useful as this file is run without + verbose xtraces on. Related reorderings in the code and new + comments. + +2010-11-10 Stefano Lattarini + + Tests defs: move static definitions in a new file `defs-static'. + The new file is meant to be idempotent w.r.t. mutiple inclusions. + * tests/defs.in: Removed, its contents split among ... + * tests/defs-static.in: ... this new file ... + * tests/defs: ... and this new file, including the former. + * configure.ac (AC_CONFIG_FILES): Remove `tests/defs', add + `tests/defs-static'. + (AC_CONFIG_LINKS): Add `tests/defs'. + * tests/Makefile.am ($(parallel_tests)): Update. + ($(instspc_tests)): Likewise. + * tests/.gitignore: Update. + + Tests defs: $testsbuilddir is now AC_SUBST'ed. + * tests/defs.in ($testsbuilddir): Substitute from @abs_builddir@. + Add sanity check on $testsbuilddir, similar to those on + $testsrcdir and $top_testsrcdir. + + Tests defs: do not print message "Running test $0" anymore. + * tests/defs.in: Printing the message "=== Running test $0" at + the beginning of each tests made sense when Automake used the old + test-driver, which sent all the output directly to stdout/stderr. + Now that the parallel test-driver is used, which saves output of + each test in its correspoding log file, that old message is just + useless noise. + + Tests defs: rename $curdir -> $testbuilddir + * tests/defs.in: Rename $curdir to $testbuildir, for clarity and + consistency with $testsrcdir and $top_testsrcdir. + + Tests defs: prefer "$curdir" over "`pwd`". + * tests/defs.in: We already save the value of `pwd` in $curdir + early in the file, so there no need to recalculate it later, when + the current working directory is not changed. + + Tests defs: use `$me' in more error messages. + * tests/defs.in: Also use `$me' in error messages referring to + missing `defs' or `defs.in', since that variable is now defined + before those checks. + + Tests defs: do not use `Exit' where plain `exit' suffices. + * tests/defs.in: Use "exit 77" rather than "Exit 77" to skip the + test when required libtool/gettext macros are not found, since + such skips would take place before the exit trap is installed. + + Tests defs: improve and extends comments. + * tests/defs.in: Improve and extends some comments, especially in + relation with the changes introduced by the previous reordering. + + Tests defs: various reorderings. + * tests/defs.in: Reordered various snippets of code in a + clearer way. + +2010-11-06 Stefano Lattarini + + New tests on obsoleted usages of automake/autoconf macros (such + as AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT). + * tests/backcompat.test: New test script. + * tests/backcompat2.test: Likewise. + * tests/backcompat3.test: Likewise. + * tests/backcompat4.test: Likewise. + * tests/backcompat5.test: Likewise. + * tests/backcompat6.test: Likewise. + * tests/init.test: Extended and improved, esp. by trying more + combinations of calls to AC_INIT and AM_INIT_AUTOMAKE with few + arguments. + * tests/Makefile.am (TESTS): Updated. + +2010-11-06 Stefano Lattarini + + Fix bug in rules for creating vala vapi/header files. + * automake.in (lang_vala_finish_target): Add forgotten "fi" in an + if control structure in a generated make rules. Bug introduced + by previous commit `v1.11-221-gd7c1679', and revealed by failure + of test `vala2.test'. + +2010-11-01 Ralf Wildenhues + + Fix and document rules to not touch the tree with `make -n'. + * doc/automake.texi (Multiple Outputs): Document the problem of + modifications during dry-run execution, propose solution. + * NEWS: Update. + * automake.in (lang_vala_finish_target): Split recipe so the + stamp file is not removed with GNU `make -n'. + (lang_yacc_target_hook): Separate removal of parser output file + and header remaking. + * lib/am/lisp.am ($(am__ELCFILES)): Determine whether -n was + passed to make, take care not to remove any files in that case. + * lib/am/remake-hdr.am (%CONFIG_H%): Separate removal of + %STAMP% file from induced remaking of config header. + * tests/autohdrdry.test, tests/lispdry.test, tests/yaccdry.test: + New tests. + * tests/Makefile.am (TESTS): Update. + +2010-11-05 Stefano Lattarini + + Fix potential bug in generated tests `instpc-*.test'. + This bug is due to the changes introduced by the recently-merged + "tests-init" branch. In that branch, `tests/defs' didn't define + anymore `$srcdir', instead defininig directly `$testsrcdir'; but + the generated tests were using `$srcdir', hence the bug. + Luckily, since the Automake parallel test driver automatically + exports `srcdir' to a proper value, that prevented the bug from + manifesting itself. + * tests/Makefile.am ($(instspc_tests)): In the generated test + scripts, use `$testsrcdir', not `$srcdir'. + +2010-11-03 Stefano Lattarini + + Overhauled and modularized tests in `instspc.test'. + The test `instspc.test' was way too big and fragile. Its running + time was very long. It also produced a log that was nearly + unreadable due to its length, making it very difficult to find + out the reason for failures. + Also, it was too much monolithic, with a single (maybe spurious) + failure in a corner case causing the whole test to fail (even if + everything worked as expected in the other 99% of cases). + The present change should solve these problems, by separating + `instspc.test' into many smaller, self-contained, auto-generated + tests. + * tests/instspc.test: Removed. + * tests/instspc-tests.sh: New script, fulfilling a double role: + 1. it generates a Makefile.am snippet `tests/instspc-tests.am', + containing the definition of a list of new tests which will take + over the older `instspc.test', and + 2. it is sourced by said generated tests with proper parameters + pre-set, to run the "meat" of the checks. + This apparent abuse is indeed required because the test generation + code and test execution code are inevitably intertwined. + * tests/Makefile.am ($(srcdir)/instspc-tests.am): Include this + snippet, which (among the other things) defines ... + (instspc_tests): ... this new macro, containing the list of the + newly generated `instspc*.test' tests, and ... + (instspc_xfail_tests): ... this new macro, containing the list + of the `instspc*.test' tests expected to fail. + ($(instspc_tests)): New rule, generates the `instspc*.test' tests. + ($(instspc_tests:.test=.log)): New rule, registers the dependency + of all `instspc*.test' tests on the `instspc-tests.sh' script. + (TESTS): Add `$(instspc_tests)', remove `instspc.test'. + (XFAIL_TESTS): Add `$(xfail_instspc_tests)'. + (EXTRA_DIST): Distribute instspc-tests.sh. + (MAINTAINERCLEANFILES): Added $(instspc_tests). + Other minor cosmetic changes. + * bootstrap: Generate instspc-tests.am. + * tests/.gitignore: Updated. + +2010-11-01 Ralf Wildenhues + + Add FAQ entry for bug reporting instructions. + * doc/automake.texi (Reporting Bugs): New section. + (Introduction): Refer to it. + 2010-10-07 Peter Rosin depcomp: add new one-pass depmode for MSVC 7 and later. diff --cc tests/defs index 82c3b5b9c,da744c3b4..8f748b1c5 --- a/tests/defs +++ b/tests/defs @@@ -290,8 -219,17 +290,17 @@@ d echo "$me: running texi2dvi -o /dev/null --version" ( texi2dvi -o /dev/null --version ) || exit 77 ;; + xsi-shell) + # Try some XSI 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 + ;; - # Generic case: the tool must support --version. *) + # Generic case: the tool must support --version. echo "$me: running $tool --version" ( $tool --version ) || exit 77 ;;