kc3-lang/automake/lib

Branch :


Log

Author Commit Date CI Message
eaac33fe 2011-07-01 11:12:31 parallel-tests: simplify testsuite summary Prefer a more deterministic, "tabular" format for the testsuite summary, always listing the numbers of passed, failed, xfailed, xpassed, skipped and errored tests, even when these numbers are zero. This simplify the logic of testsuite summary creation, makes it more easily machine-parseable, and will probably allow for easier addition of new kinds of test results in the future. * lib/am/check.am (am__tty_colors_dummy): New make variable, to reduce code duplication. Extracted from previous versions of $(am__tty_colors), and extended by defining two new variables `$mgn' and `$brg'. [%?COLOR%, %!?COLOR%] (am__tty_colors): Use that new variable. (am__text_box): Delete, is not needed anymore. ($(TEST_SUITE_LOG)): Rewrite associated rules to implement the new testsuite summary format. * NEWS: Update. * tests/check10.test: Don't run with the parallel-tests harness too, that makes no sense anymore. * tests/color.test: Update and adjust. * tests/color2.test: Likewise. * tests/parallel-tests.test: Likewise. * tests/parallel-tests3.test: Likewise. * tests/parallel-tests6.test: Likewise. * tests/parallel-tests9.test: Likewise. * tests/parallel-tests-unreadable-log.test: Likewise. * tests/parallel-tests-empty-testlogs.test: Likewise. * tests/parallel-tests-log-override-recheck.test: Likewise. * tests/parallel-tests-no-spurious-summary.test: Likewise. * tests/test-driver-custom-multitest.test: Likewise. * tests/test-driver-end-test-results.test: Likewise. * tests/parallel-tests-no-color-in-log.test: New test. * tests/testsuite-summary-color.test: Likewise. * tests/testsuite-summary-count.test: Likewise. * tests/testsuite-summary-count-many.test: Likewise. * tests/testsuite-summary-reference-log.test: Likewise. * tests/testsuite-summary-checks.sh: New auxiliary script, used by the new tests above. * tests/extract-testsuite-summary: Likewise. * tests/trivial-test-driver: Optimize for speed when there are lots of of tests. * tests/Makefile.am (EXTRA_DIST): Distribute them. (testsuite-summary-color.log, testsuite-summary-count.log): Depend on them. (testsuite-summary-count-many.log): Depend on the auxiliary scripts 'trivial-test-driver' and 'extract-testsuite-summary'. (TESTS): Update.
15400bca 2011-06-30 14:55:43 parallel-tests: new recognized test result 'ERROR' * lib/am/check.am ($(TEST_SUITE_LOG)): Recognize a new test result `ERROR'. Use it when encountering unreadable test logs (previously a simple `FAIL' was used in this situations). * lib/test-driver: Set the global test result to `ERROR' when the test exit status is 99. When doing colorized output, color `ERROR' results in magenta. * doc/automake.texi (Log files generation and test results recording): Update by also listing `ERROR' among the list of valid `:test-results:' arguments. * NEWS: Update. * tests/trivial-test-driver: Update. * tests/parallel-tests.test: Likewise. * tests/parallel-tests-harderror.test: Likewise. * tests/parallel-tests-no-spurious-summary.test: Likewise. * tests/test-driver-global-log.test: Likewise. * tests/test-driver-recheck.test: Likewise. * tests/test-driver-custom-multitest-recheck.test: Likewise. * tests/test-driver-custom-multitest-recheck2.test: Likewise. * tests/test-driver-custom-multitest.test: Likewise. * tests/test-driver-custom-no-html.test: Likewise. * tests/test-driver-end-test-results.test: Likewise. * tests/color.test: Likewise. Also, make stricter, and also test from VPATH. * tests/color2.test: Likewise, and improve syncing with color.test. * tests/parallel-tests-exit-statuses.test: New test. * tests/parallel-tests-console-output.test: Likewise. * tests/Makefile.am (TESTS): Update.
61b2bb0d 2011-06-29 16:02:52 parallel-tests: make parsing of test results safer The new code for parsing the testsuite-generated `.log' files, as introduced in commit `v1.11-872-gc96b881', considers each `:test-result:' field anywhere in a `.log' file as a declaration of a test result, and accounts for it as such in the testsuite summary. Unfortunately this could easily cause spurious test failures being reported in the testsuite summary. This happened in practice with the Automake's own testsuite; for example: $ make check TESTS='check12-p.test'; echo exit: $? ... PASS: check12-p.test ===================================== 4 of 5 tests failed See tests/test-suite.log Please report to bug-automake@gnu.org ===================================== make[2]: *** [test-suite.log] Error 1 make: *** [check-am] Error 2 exit: 2 This change introduces a new special `:test-result:' "END", that, when seen, prevents the rest of the log file from being parsed. For more information, refer to the thread: <http://lists.gnu.org/archive/html/automake-patches/2011-06/msg00199.html> * lib/am/check.am ($(TEST_SUITE_LOG)): Stop the parsing of a log file as soon as the special ":test-result:END" directive is seen. Related changes and enhancements. * lib/test-driver: Protect the rest of the log after the result lined with a ":test-result:END" directive. * tests/parallel-tests-no-spurious-summary.test: New test. * tests/test-driver-end-test-results.test: Likewise. * tests/Makefile.am (TESTS): Update.
14027413 2011-06-22 21:59:34 docs: document custom test drivers and protocols * doc/automake.texi (Simple Tests): Note that the TESTS_ENVIRONMENT use suggested here is not portable to 'parallel-tests'. (Simple Tests using parallel-tests): Document new restrictions on the uses of TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT. (Custom Test Drivers): New section and node. (Overview of Custom Test Drivers Support): New subsection. (Declaring Custom Test Drivers in @file{Makefile.am}): Likewise. (APIs for Custom Test Drivers): Likewise. (Options): Update description of color-tests. * lib/am/check ($(TEST_SUITE_LOG)): Remove comments that have been moved into the manual. (recheck, recheck-html): Minor adjustments to better conform to the documentation (this should cause no semantic changes w.r.t. the former behaviour); minor improvements and extensions to existing comments. * tests/test-driver-create-log-dir.test: New test. * tests/test-driver-strip-vpath.test: Likewise. * tests/test-driver-global-log.test: Likewise. * tests/test-driver-recheck.test: Likewise. * tests/Makefile.am (TESTS): Update.
c96b881f 2011-06-03 22:50:56 parallel-tests: allow each test to have multiple results With this change, we improve the code creating the `test-suite.log' global log and the console testsuite summary to make it able to grasp multiple results per test script. This is required in order to introduce the planned support for test protocols, like TAP and SubUnit, which can indeed run multiple tests per test script, each with its individual result. The implementation makes use of a custom reStructuredText field `:test-result:'. Note that no new documentation is added by this change; that is be left for follow-up changes. * lib/check.am ($(TEST_SUITE_LOG)): When processing .log files, recognize a report of a test's result only if it is declared with the custom `:test-result:' reStructuredText field placed at the beginning of a line. Extend and add explanatory comments. (recheck, recheck-html): Add explanatory comments. * lib/test-driver: Write an appropriate reStructuredText field `:test-result:' in the generated log file. Use a reStructuredText transition to better separate the test outcome report from the test script's registered output. Improve comments. * tests/test-driver-custom-xfail-tests.test: Adjust. * tests/parallel-tests7.test: Adjust. * tests/parallel-tests-empty-testlogs.test: New test. * tests/parallel-tests-recheck-override.test: Likewise. * tests/parallel-tests2.test: Extend and keep more in-sync with ... * tests/test-driver-custom-html.test: ... this new related test. * tests/test-driver-custom-no-html.test: New test. * tests/test-driver-custom-multitest.test: Likewise. * tests/test-driver-custom-multitest-recheck.test: Likewise. * tests/test-driver-custom-multitest-recheck2.test: Likewise. * tests/trivial-test-driver: New file, used by the last four tests above. * tests/Makefile.am (TESTS): Update. (EXTRA_DIST): Distribute `trivial-test-driver'. (test-driver-custom-multitest.log): Depend on `trivial-test-driver'. (test-driver-custom-multitest-recheck.log): Likewise. (test-driver-custom-multitest-recheck2.log): Likewise. (test-driver-custom-html.log): Likewise.
79922343 2011-05-20 21:45:51 parallel-tests: allow custom driver scripts Allow suffix-based definition of custom "driver script" for the test scripts. These driver scripts will be responsible of launching the tests (or their corresponding $(LOG_COMPILER), if they have an associated one), interpreting and displaying the test results, and writing the `.log' files. This new API should allow easy and flexible use of different test protocols in the future; in particular, we plan to use it to implement TAP and SubUnit harnesses. Note that no new documentation is added by this change; that is be left for follow-up changes. * automake.in (handle_tests): Define default for $(LOG_DRIVER), and, for any registered test extension `<ext>', define defaults for $(<ext>_LOG_DRIVER). Substitute %DRIVER% using these new variables, instead of the old internal $(am__test_driver). When processing check2.am, also substitute %DRIVER_FLAGS%. Require auxiliary script `test-driver' only if no driver has been explicitly defined for the test script kinds. * am/check2.am (?GENERIC?%EXT%$(EXEEXT).log, ?GENERIC?%EXT%.log, ?!GENERIC?%OBJ%): Pass the %DRIVER_FLAGS% to the %DRIVER% call. * tests/parallel-tests-no-extra-driver.test: New test. * tests/test-driver-custom.test: Likewise. * tests/test-driver-custom-xfail-tests.test: Likewise. * tests/test-driver-fail.test: Likewise. * tests/Makefile.am: Update. * NEWS: Update.
a27c9c49 2011-05-10 11:30:05 parallel-tests: add auxiliary script 'test-driver', refactor This refactoring should cause no API of functionality change, and is meant only to simplify the future implementation of TAP and SubUnit testsuite drivers. More precisely, our roadmap is to move most of the "testsuite driving" features out of the Automake-generated Makefiles, and into external scripts with well-defined interfaces. This will allow the user to define its own personalized testsuite drivers, and will also offer us a framework upon which to implement our new TAP and SubUnit drivers, all in a very unobtrusive way and retaining an high degree of code reuse and backward-compatibility. * lib/test-driver: New auxiliary script. * lib/Makefile.am (dist_SCRIPT_DATA): Add it. * automake.in (handle_tests): Require the new auxiliary script `test-driver', and define a new internal makefile variable `$(am__test_driver)', used to call it. Perform new substitution on `DRIVER' when processing the `check2.am' file. * lib/check.am (am__tty_colors): Define new shell variable `$am__color_tests'. (am__rst_section): Removed, its role taken over by the new `test-driver' script. (am__test_driver_flags): New variable, contains the command line options passed to `test-driver'. (am__check_pre): Do not deal with temporary files and exit traps anymore, as the `test-driver' script takes care of that now. Define shell variable `$am__enable_hard_errors', used by `$(am__test_driver_flags)'. Reorder so that we don't need to save and restore the value of the `TERM' environment variable anymore. Other related adjustments. (am__check_post): Remove, as its role has been completely taken over by the `test-driver' script. * am/check2.am (?GENERIC?%EXT%$(EXEEXT).log, ?GENERIC?%EXT%.log, ?!GENERIC?%OBJ%): Call the test script through the Automake substituted `%DRIVER%', and honor the command-line options in `$(am__test_driver_flags)'. Do not call the obsoleted `$(am__check_post)' anymore. * doc/automake.texi (Auxiliary Programs): Mention the new `test-driver' script. (Optional): Mention `test-driver' in AC_CONFIG_AUX_DIR. Since we are at it, break the list of auxiliary scripts by placing one per line, to simplify potential future additions of new scripts. * tests/check.test: Adjust. * tests/check2.test : Likewise. * tests/check3.test : Likewise. * tests/check4.test : Likewise. * tests/check10.test: Likewise. * tests/color.test: Likewise. * tests/color2.test: Likewise. * tests/comment9.test: Likewise. * tests/dejagnu.test: Likewise. * tests/exeext4.test: Likewise. * tests/maken3.test: Likewise. * tests/maken4.test: Likewise. * tests/parallel-tests-interrupt.test: Likewise. * tests/posixsubst-tests.test: Likewise. * tests/repeated-options.test: Likewise. * tests/check-no-test-driver.test: New test. * tests/parallel-test-driver-install.test: Likewise. * tests/Makefile.am (TESTS): Update. * NEWS: Update.
583daa1e 2011-06-20 10:46:09 Merge branch 'maint' * maint: check: don't use multi-line coloring for the report ansi2knr: deprecate, it will go away in the next major release docs: primary/prefix combination "pkglib_PROGRAMS" is now invalid docs: replace obsolete @vindex entry with a useful one docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases
b8c2b699 2011-06-17 21:59:52 check: don't use multi-line coloring for the report "less -R" can't handle multi-line coloring as it is done for the check reports of the serial and parallel testsuite, because of performance reasons. Thus, color each line of the check report by its own. * lib/am/check.am (am__text_box): Accept colors for lines, and color each line by its own. [%?PARALLEL_TESTS%] $(TEST_SUITE_LOG): Let am__text_box handle the line coloring. [!%?PARALLEL_TESTS%] $(check-TESTS): Color each report line by its own. * THANKS: Update.
98fab124 2011-06-13 21:27:35 ansi2knr: deprecate, it will go away in the next major release * doc/automake.texi: Loudly and repeatedly state that the old de-ANSI-fication features are now deprecated and will be removed in the next major Automake release. Other related adjustments. * lib/Automake/Options.pm (_process_option_list ): Give a warning in the `obsolete' category when the `ansi2knr' option is used. * m4/protos.m4 (AM_C_PROTOTYPES): Deprecate this macro: a warning in the `obsolete' category will be emitted it if is used. * tests/ansi2knr-deprecation.test: New test. * tests/Makefile.am (TESTS): Update. * tests/ansi.test: Adjust, by calling autoconf and/or automake with the `-Wno-obsolete' flag. * tests/ansi10.test: Likewise. * tests/ansi2.test: Likewise. * tests/ansi3.test: Likewise. * tests/ansi3b.test: Likewise. * tests/ansi4.test: Likewise. * tests/ansi5.test: Likewise. * tests/ansi6.test: Likewise. * tests/ansi7.test: Likewise. * tests/ansi8.test: Likewise. * tests/ansi9.test: Likewise. * tests/cxxansi.test: Likewise. * tests/libobj8.test: Likewise. * NEWS: Update about the future planned backward-incompatibility due to the removal of de-ANSI-fication feature.
43d62e07 2011-06-16 16:56:36 Merge branch 'maint' * maint: news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS tests: optimize tests on primary/prefix mismatch for speed Warnings about primary/prefix mismatch fixed and extended. maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS docs: better documentation for silent make rules
97600392 2011-06-10 12:26:42 distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS * doc/automake.texi (Checking the Distribution): Suggest to use AM_DISTCHECK_CONFIGURE_FLAGS, not DISTCHECK_CONFIGURE_FLAGS, to define (in the top-level Makefile.am) extra flags to be passed to configure at "make distcheck" time; DISTCHECK_CONFIGURE_FLAGS should be reserved for the user. Add proper `@vindex' directive. Document that AM_DISTCHECK_CONFIGURE_FLAGS is not honoured in a subpackage Makefile.am, but the flags in it are passed down to the configure script of the subpackage. * lib/am/distdir.am (distcheck): Also pass the flags in $(AM_DISTCHECK_CONFIGURE_FLAGS) to the configure invocation. Update comments. * tests/defs.in.test (AM_DISTCHECK_CONFIGURE_FLAGS, DISTCHECK_CONFIGURE_FLAGS): Unset in case they are exported in the environment, they might improperly influence our testsuite. * tests/distcheck-configure-flags.test: New test. * tests/distcheck-configure-flags-am.test: Likewise. * tests/distcheck-configure-flags-subpkg.test: Likewise. * distcheck-hook.test: Likewise. * distcheck-hook2.test: Likewise. * tests/Makefile.am (TESTS): Update. Closes automake bug#8487.
2aa8c8e8 2011-06-01 19:37:18 Merge branch 'maint' * maint: remake: behave better with non-GNU make in subdirectories
67ca6940 2011-06-01 18:58:35 Merge branch 'remake-rules-non-GNU-make' into maint
3eb05919 2011-05-31 18:03:48 Merge branch 'maint' * maint: automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too tests/README: fix example about `make -e' usage
8a8890a9 2011-05-29 11:04:08 build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too Our build system allows the user to override AUTOCONF and AUTOHEADER at configure time, and honours these overrides in our testsuite. But it didn't do the same with AUTOM4TE, AUTORECONF and AUTOUPDATE. This change fixes that inconsistency. * configure.ac (am_AUTOM4TE, am_AUTOUPDATE, am_AUTORECONF): New AC_SUBSTitutions. Update comments. * tests/defs.in ($AUTOUPDATE): Default to `@am_AUTOUPDATE@' now. ($AUTOM4TE): New variable, defaulting to `@am_AUTOM4TE@'. ($AUTORECONF): New variable, defaulting to `@am_AUTORECONF@'. * doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Update.
bee9871d 2011-05-29 15:24:58 remake: behave better with non-GNU make in subdirectories Currently, with every decent make program, it is possible to rebuild out-of-date autotools-generated files with a simple "make Makefile" -- but for this to work reliably with non-GNU make implementations, the command must be issued from the top-level directory. This patch removes such limitation. * lib/am/configure.am (am--refresh): Depend on `%MAKEFILE%'. * tests/defs.in (using_gmake): New function, backported from the `master' branch (and simplified). * tests/remake-subdir.test: New test. * tests/remake-subdir2.test: Likewise. * tests/remake-subdir-gnu.test: Likewise. * tests/remake-subdir-from-subdir.test: Likewise. * tests/Makefile.am (TESTS): Update.
feed175b 2011-04-19 09:46:53 Merge branch 'am-tests-environment'
12f48faf 2011-04-18 00:52:03 check: rename AM_TESTS_SETUP -> AM_TESTS_ENVIRONMENT The AM_TESTS_SETUP naming was not a good one after all. It may be technically more correct than AM_TESTS_ENVIRONMENT, but the latter is a better one simply because it is easier to remember, and even if you've never heard of it and only know the semantics of TESTS_ENVIRONMENT, you can have a straightforward way to figure out how AM_TESTS_ENVIRONMENT would work. * tests/check.am (am__check_pre): Update. * doc/automake.in (Simple Tests using parallel-tests): Update. * tests/parallel-tests-am_tests_setup.test: Renamed ... * tests/parallel-tests-am_tests_environment.test: ... to this, and updated. * tests/Makefile.am (TESTS): Update. Suggestion and motivation by Ralf Wildenhues.
0fea91c2 2011-04-17 15:21:34 Merge branch 'am-tests-setup'
95bbdf16 2011-01-24 11:34:32 check: new developer-reserved AM_TESTS_SETUP variable For reference, see the discussion at: <http://lists.gnu.org/archive/html/automake-patches/2011-01/msg00213.html> * lib/am/check.am [%?PARALLEL_TESTS%] (am__check_pre): Pass also $(AM_TESTS_SETUP). Comments updated, and some typos fixed. * doc/automake.texi (Simple Tests using parallel-tests): Document AM_TESTS_SETUP. Reorder some of the existing documentation a bit. * tests/parallel-tests-am_tests_setup.test: New test. From a suggestion by Ralf Wildenhues.
edf2c191 2011-04-16 12:50:09 Merge branch 'maint'
e78436cf 2011-04-16 11:55:46 depcomp: correct invalid sed invocation * lib/depcomp: Insert missing -e before '/:$/d'. Otherwise, that use of sed would treat '/:$/d' as a file name. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
b39dba39 2011-04-11 17:07:47 Merge branch 'fix-depcomp'
9ada18be 2011-04-11 12:26:58 depcomp: fix bugs in tests and in the depcomp script * lib/depcomp (gcc): Remove duplicated `-e' from sed invocation. * tests/depcomp10.test: Make it executable. Fix a blunder that has left part of an intended comment not prefixed by `#', thus causing shell syntax errors. In this same comment, break a too-long reported error message on multiple lines, for clarity. Add reference to the relevant bug report. Add a comment which explains why the test result 'skipped' if the first "make" call fails. Add other useful comments. * tests/depcomp9.test: Slightly improve comments.
942e4424 2011-04-11 07:09:50 Merge branch 'maint'
1ae0d32e 2011-04-11 07:06:08 Fix hp depmode for VPATH builds with GNU make. * lib/depcomp: Be sure to remove VPATH-prefixed object from dependency output when creating stub rule. * tests/depcomp10.test: New test. * tests/Makefile.am (TESTS): Update. * NEWS: Update. Report by Bruno Haible. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
3a5f0a8b 2011-04-09 12:39:44 Merge branch 'maint'
7953494a 2011-04-09 12:38:11 Clarify regex code in depcomp. * lib/depcomp: Add comment why we don't need regex-escaping here. Suggested by Stefano Lattarini. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
6a85bc48 2011-04-06 22:17:01 Fix makedepend depmode for VPATH builds. * lib/depcomp [makedepend]: Remove any VPATH prefix from the object file name, so a rebuild doesn't attempt to update the .Po files in the source tree. * tests/depcomp9.test: New test. * tests/Makefile.am (TESTS): Update. * NEWS: Update. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
a7d37f15 2011-03-01 10:25:26 Merge branch 'maint'
d51e7b79 2011-02-24 10:21:19 libtool: suggest LT_INIT if LTLIBRARIES primary is used When the LTLIBRARIES primary was used, but $(LIBTOOL) wasn't defined, automake suggested to add a call to AC_PROG_LIBTOOL in configure.ac. But that macro is deprecated since Libtool version 1.9b (2004-08-29), in favor of the newer LT_INIT. So suggest the use of this latter macro instead. * lib/Automake/Variable.pm (%_am_macro_for_var): Pair 'LIBTOOL' with 'LT_INIT', not with 'AC_PROG_LIBTOOL'. * libtool4.test: Adjust and extend. Also, add a call to macro AC_PROG_CC in configure.in, to help ensuring that automake does not fail for the wrong reasons. * ltinit.test: New test, ensure that automake's libtool support works with LT_INIT-based interface. Thanks to Jack Kelly for the suggestion.
e9d5de54 2011-01-22 18:31:12 Merge branch 'maint'
e9b44d82 2011-01-22 11:16:06 Add comment to check-TESTS rule working around make 3.80 bug. * lib/am/check.am (check-TESTS): Update comment. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15a6e56f 2011-01-19 21:50:02 install-sh: avoid Tru64 sh `test' operator precedence issues. * lib/install-sh: Protect file names and directory components that consist of `=', `(', `)', or `!'. Move protection as early as possible, to avoid errors such as with Tru64 sh `test -z ='. * tests/instsh2.test: Extend test to cover more possibilities. Fixes 1.12 instspc-equal-install.test failure on Tru64/OSF 5.1. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
f20b389a 2011-01-18 14:00:44 Merge branch 'fix-perl-local-uscore' into warns-win-over-strictness * fix-perl-local-uscore: Avoid local $_ perl variable, for Perl before 5.9.1.
80d2f4a1 2011-01-17 07:43:59 Merge branch 'fix-perl-local-uscore' * fix-perl-local-uscore: Avoid local $_ perl variable, for Perl before 5.9.1.
c4c1aa2d 2011-01-16 23:00:35 Avoid local $_ perl variable, for Perl before 5.9.1. * lib/Automake/Options.pm (_process_option_list): Do not lexically localize $_. Fixes bootstrap on AIX 5.1. Bug introduced in commit `v1.11-622-gf90a06c'. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
a2052908 2011-01-16 18:02:51 Merge branch 'maint'
080efc94 2011-01-16 13:48:17 parallel-tests: work around Tru64/OSF 5.1 sh read bugs. * lib/am/check.am ($(TEST_SUITE_LOG), recheck, recheck-html): Test file readability before redirecting input from it, to avoid exiting Tru64/OSF 5.1 sh which treats read as special builtin. * tests/parallel-tests-unreadable-log.test: New test. * tests/Makefile.am (TESTS): Update. * NEWS: Update. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1609491e 2010-12-20 18:29:50 Warnings win over strictness in AUTOMAKE_OPTIONS. Ensure that, for what concerns the options specified in AUTOMAKE_OPTIONS, explicitly-defined warnings always take precedence over implicit strictness-implied warnings. This finally fixes Automake bug#7669 a.k.a. PR/547. * automake.in (handle_options): Call 'process_option_list' only once per set of options. * lib/Automake/Options.pm (process_global_option_list, process_option_list): Add sanity checks. ($_options_processed, $_global_options_processed): New internal variables, used by the sanity checks above. * tests/warnings-win-over-strictness.test: Extend.
f90a06c1 2010-12-20 16:59:08 Change signature of 'Automake::Options::_process_option_list()'. This only modifies internal details in the automake implementation, bearing no externally visible effect, but preparing the way for the final fix of Automake bug#7669 a.k.a. PR/547. * lib/Automake/Options.pm (_process_option_list): Now accepts as arguments a list of hash references with keys 'option' and 'where', where 'option' is an option as might occur in AUTOMAKE_OPTIONS or M_INIT_AUTOMAKE, and 'where' is the location where that occurred. (process_option_list, process_global_option_list): Update. * automake.in (handle_options, scan_autoconf_traces): Update.
9a88bf66 2010-12-20 14:57:27 Warnings win over strictness in AM_INIT_AUTOMAKE. This change ensures that, for what concerns the options specified in AM_INIT_AUTOMAKE, explicitly-defined warnings always take precedence over implicit strictness-implied warnings. Related to Automake bug#7669 a.k.a. PR/547. * lib/Automake/Options.pm (_process_option_list): Parse explicit warnings only after the strictness level has been set. Fix POD documentation. * tests/warnings-win-over-strictness.test: Extend.
20664697 2011-01-11 13:24:06 Merge branch 'maint'
36bd4534 2011-01-09 19:05:07 Fix another typo in Rule.pm comment. * lib/Automake/Rule.pm: Fix typo. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
85eea96a 2011-01-11 02:35:38 Merge branch 'maint' Conflicts: ChangeLog Apparently I messed up doing a previous 'git pull', so that the "latest" maint I've merged into master (and pushed!) wasn't a fast-forward from origin/maint. Yay for me. This merge should help cleaning up the mess.
ece3872f 2011-01-09 18:54:36 Fix another typo in Rule.pm comment. * lib/Automake/Rule.pm: Fix typo. Report by Peter Rosin. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
a71a5686 2011-01-09 15:30:42 Merge branch 'maint'
0d93356e 2011-01-09 10:53:04 Fix typos in Rule.pm comments. * lib/Automake/Rule.pm: Fix typos in comments. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
b9ab6dd3 2011-01-02 06:12:13 Merge branch 'maint'
1247b641 2011-01-02 06:11:28 Sync auxiliary files from upstream. * lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from upstream. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
3c9e7acc 2011-01-02 05:38:18 Merge branch 'maint'
511ccb16 2011-01-02 05:31:41 Bump copyright years. * aclocal.in (write_aclocal, version): Bump copyright years. * automake.in (gen_copyright, version): Likewise. * doc/automake.texi: Likewise. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
fe3444ed 2010-11-21 21:57:34 Merge branch 'maint'
6f1e8ccb 2010-11-19 21:50:31 Sync config-ml.in from GCC. * config-ml.in: Add Go support: treat GOC and GOCFLAGS like other compiler/flag environment variables. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
3f2d2179 2010-11-19 21:24:43 Merge branch 'maint'
15cd54c0 2010-11-19 20:24:28 Automake::Config: remove extra trailing semicolon. * lib/Automake/Config.in: Remove extra trailing semicolon.
a190f548 2010-11-16 13:08:23 Merge branch 'tests-init'
206f3bf1 2010-11-16 13:08:06 Merge branch 'msvc' into tests-init
d164eb55 2010-11-15 10:37:26 lib/compile: update scriptversion. Signed-off-by: Peter Rosin <peda@lysator.liu.se>
89bf6658 2010-11-15 10:27:55 compile: clear the `eat' variable earlier. * lib/compile: Clear the `eat' variable earlier. * tests/compile3.test: Prevent regressions. Signed-off-by: Peter Rosin <peda@lysator.liu.se>
b6ee4603 2010-11-14 18:04:58 Merge branch 'maint'
a6da48d3 2010-11-14 17:53:49 Fix install-strip when $(STRIP) contains several words. * lib/am/install.am (install-strip): Update comment. Use separate sub-make invocations for empty and nonempty $(STRIP), to fix quoting issues. * tests/strip2.test, tests/strip3.test: New tests. * tests/Makefile.am (TESTS): Adjust. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
3dffb015 2010-11-07 15:23:41 Merge branch 'maint'
7a020d66 2010-11-06 12:46:52 Fix a bug in variable concatanation with `+='. * lib/Automake/VarDef.pm (append): Remove extra backslash-escaped newlines from the end of the variable's content, before appending to it. * tests/pluseq11.test: New test, exposing the bug. * tests/Makefile.am (TESTS): Update. Reported by Andy Wingo.
f7adc0f4 2010-11-06 20:32:48 Merge branch 'maint'
d7c1679b 2010-10-03 12:29:40 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. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
450bd455 2010-10-07 22:47:11 Merge branch 'msvc'
17a7a6fc 2010-10-07 22:27:53 depcomp: add new one-pass depmode for MSVC 7 and later. * lib/depcomp: Add new depmodes 'msvc7' and 'msvc7msys' which make use of the -showIncludes option added in MSVC 7. * m4/depend.m4 (_AM_DEPENDENCIES): Handle the new depmodes similarly to 'msvisualcpp' and 'msvcmsys' as MSVC does not support the -o option. Signed-off-by: Peter Rosin <peda@lysator.liu.se>
6da46f31 2010-10-02 22:30:02 dist-xz, dist-bzip2: don't hard-code -9: honor envvar settings * lib/am/distdir.am (dist-xz): Do not hard-code xz's -9: that made it impossible to override. Instead, use its XZ_OPT envvar, defaulting to -9 if not defined. Thus no change in behavior when XZ_OPT is not set, and now, this rule honors the setting of that envvar when it is set. Suggested by Lasse Collin. (dist-bzip2): Likewise for it's corresponding envvar: BZIP2. * NEWS (Miscellaneous changes): Mention it. * doc/automake.texi (The Types of Distributions): Describe the newly enabled environment variables.
f6b05bd1 2010-10-03 11:44:13 Merge branch 'maint'
b8c1325a 2010-10-03 11:42:12 Document and fix expansion of variables before rules. * doc/automake.texi (General Operation): Document that variables are expanded before rules. * lib/am/check.am (am__check_post): Reword a bit so it does not get matched as a rule. Suggestion by Ben Pfaff. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
6edafbb5 2010-10-02 20:25:53 Implement EXTRA_maude_DEPENDENCIES for programs and libraries. * automake.in (handle_programs, handle_libraries) (handle_ltlibraries): Mark EXTRA_*_DEPENDENCIES as recognized. * doc/automake.texi (Linking, Program and Library Variables) (LIBOBJS): Document EXTRA_*_DEPENDENCIES. * lib/am/library.am (%LIBRARY%): Also depend on $(EXTRA_%XLIBRARY%_DEPENDENCIES). * lib/am/ltlibrary.am (%LTLIBRARY%): Also depend on (%XLTLIBRARY%_DEPENDENCIES). * lib/am/program.am (%PROGRAM%%EXEEXT%): Also depend on $(EXTRA_%XPROGRAM%_DEPENDENCIES). * tests/extradep.test, tests/extradep2.test: New tests. * tests/Makefile.am (TESTS): Update. * NEWS: Update. Suggested by Eric Blake. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
c3eab9af 2010-10-02 18:43:01 Merge branch 'maint'
9e126f15 2010-10-02 18:38:34 Merge branch 'fix-tests-empty-regression' into maint * fix-tests-empty-regression: Revert "parallel-tests: avoid command-line length limit issue."
614b643e 2010-09-26 09:21:14 Revert "parallel-tests: avoid command-line length limit issue." This reverts commit 24e3b4ee2f8cb9f72dd94a05a893f3d4e88b7835, because it re-opened the bug fixed by v1.11-10-g218e678. 2010-09-07 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> parallel-tests: avoid command-line length limit issue. * automake.in (handle_tests): New argument $makefile, new substitution %MAKEFILE%. (generate_makefile): Adjust. * lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass sanitized TEST_LOGS value as makefile snippet on standard input to $(MAKE), to avoid exceeding the command line limit on w32 (MSYS). * NEWS: Update. Report by Bob Friesenhahn. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
ea1a4174 2010-09-26 16:39:45 Merge branch 'maint' Conflicts: Makefile.am Makefile.in lib/Automake/Configure_ac.pm
627f0a91 2010-09-22 21:35:58 Perl modules: remove references to "Automake CVS repository". * lib/Automake/Channels.pm: Update comments to refer to "Automke's git repository" rather than to "Automake's CVS repository". * lib/Automake/Configure_ac.pm: Likewise. * lib/Automake/FileUtils.pm: Likewise. * lib/Automake/Struct.pm: Likewise. * lib/Automake/XFile.pm: Likewise. * lib/Automake/Version.pm (=head1 DESCRIPTION): Refer to "git branches" rather than "CVS branches".
c423cdb4 2010-09-22 21:26:09 Remove obsolete .cvsignore files. * .cvsignore, doc/.cvsignore, lib/.cvsignore, lib/am/.cvsignore, lib/Automake/.cvsignore, lib/Automake/tests/.cvsignore, m4/.cvsignore, tests/.cvsignore: Files deleted. Even when using savannah's CVS readonly mirror there's no way to commit back to the real repository, so this files are not worth maintaining or keeping around.
7b0ff55f 2010-09-21 21:11:00 Merge branch 'msvc'
0431dc44 2010-09-21 20:59:54 compile: implement library search to support MSVC static linking * lib/compile (func_cl_wrapper): Implement library search and -static option so that the user can select whether to prefer dll import libraries or static libraries. This enables MSVC to link against dlls generated by libtool without requiring libtool or workarounds such as -lfoo.dll etc. Makes the tests/static.at test case in libtool pass. * tests/compile3.test: Don't trip up if there happens to exist a "foo" library in the library search path. * tests/compile6.test: New test, verifying the library search. * tests/Makefile.am (TESTS): Update. Signed-off-by: Peter Rosin <peda@lysator.liu.se>
35597a75 2010-09-17 14:17:07 Merge branch 'maint'
978dfcf5 2010-09-17 06:31:33 Avoid triple-space after period. * automake.in (handle_single_transform): Avoid 3 spaces at sentence end. * ChangeLog.03: Likewise. * lib/Automake/ChannelDefs.pm: Likewise. * lib/Automake/Channels.pm (_print_message): Likewise. * lib/Automake/Rule.pm (rule): Likewise. * lib/Automake/Variable.pm (var): Likewise. * lib/am/distdir.am: Likewise. * tests/insthook.test: Likewise. Signed-off-by: Eric Blake <eblake@redhat.com>
f60e9ae2 2010-09-07 04:58:02 Merge branch 'maint'
24e3b4ee 2010-09-07 04:38:08 parallel-tests: avoid command-line length limit issue. * automake.in (handle_tests): New argument $makefile, new substitution %MAKEFILE%. (generate_makefile): Adjust. * lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass sanitized TEST_LOGS value as makefile snippet on standard input to $(MAKE), to avoid exceeding the command line limit on w32 (MSYS). * NEWS: Update. Report by Bob Friesenhahn.
ccb31f6a 2010-09-07 04:35:49 Posix 2008 requires make to set errexit. * lib/am/check.am: Update comment.
d6bb3cf2 2010-09-02 21:04:52 Merge branch 'msvc'
0a99a243 2010-09-02 21:04:00 Make ar-lib support backslashed files in archives. * lib/ar-lib: If an archive member contains a backslash, make sure it is escaped when the archive member is extracted. * tests/ar-lib.test: Test the above. Signed-off-by: Peter Rosin <peda@lysator.liu.se>
33a8e710 2010-08-31 21:58:29 Merge branch 'msvc'
8429d356 2010-08-31 21:57:22 Do file name conversion for object files in the compile wrapper. * lib/compile (func_cl_wrapper): Do file name conversion for object files (i.e. extensions .obj, .OBJ, .o and .O) if needed. * lib/compile4.test: Test the above. Signed-off-by: Peter Rosin <peda@lysator.liu.se>
81e3ce95 2010-08-21 11:07:22 Merge branch 'faster-clean' * faster-clean: Speed up removal of auxiliary linker output files for ltlibraries.
5b60e261 2010-08-21 11:05:25 Merge branch 'maint'
409b9c86 2010-08-21 11:04:04 Speed up removal of auxiliary linker output files for ltlibraries. * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Rewrite using just one `rm' invocation. Report by Bob Friesenhahn. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
b268a1f6 2010-08-21 07:27:12 Improve robustness of mdate-sh script. * lib/mdate-sh: Sanitize zsh behavior on startup, to ensure $ls_command is word-split properly upon invocation. (error): New function. (main): Use it. Improve error checking to avoid endless loop in case $ls_command gave bogus output. Fix eval quotation. * tests/mdate6.test: New test, to expose eval quotation error. * tests/Makefile.am: Update. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
dbbcbfc9 2010-08-16 22:06:07 Merge branch 'msvc'
77f0a9fd 2010-08-16 13:50:32 Optimize compile script on MSYS. * lib/compile (func_file_conv): Add new argument 'lazy' which takes an optional list of conversion types where the requested conversion isn't needed. (func_cl_wrapper): Take advantage of the above for cases where MSYS is doing the conversion for us. Suggested by Ralf Wildenhues. Signed-off-by: Peter Rosin <peda@lysator.liu.se>
5b76e39c 2010-08-16 10:00:23 Merge branch 'msvc'
a8995333 2010-08-16 09:59:10 Support more C++ file extensions for MSVC in the compile script. * lib/compile (func_cl_wrapper): MSVC only recognizes the .cpp file extension as C++, unless it's given a hint. So hint about .cc, .CC, .cxx, .CXX, c++ and C++. Also do path conversion on .c, .cpp, .CPP, .lib, .LIB and .Lib files. * lib/compile3.test: Test the C++ hinting. Signed-off-by: Peter Rosin <peda@lysator.liu.se>
09cbcbb3 2010-08-13 08:23:44 Merge branch 'msvc'
8c406f64 2010-08-12 18:01:18 Enable the use of "link -lib" as the wrapped archiver. * lib/ar-lib: Enable the use of "link -lib" as the wrapped archiver, as well as allowing some other options to be passed through to the wrapped archiver. * tests/ar-lib.test: Test the above. Signed-off-by: Peter Rosin <peda@lysator.liu.se>