From: Ralf Wildenhues Date: Sun, 6 Jun 2010 14:40:49 +0000 (+0200) Subject: Merge branch 'fix-distcheck' X-Git-Tag: ng-0.5a~414 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80709460757a0858585e3275e0a06998db635f5b;p=thirdparty%2Fautomake.git Merge branch 'fix-distcheck' * fix-distcheck: Fix distcheck failure with distributed generated parallel tests. --- 80709460757a0858585e3275e0a06998db635f5b diff --cc ChangeLog index 5f4d908f0,8b63a598c..4f9471506 --- a/ChangeLog +++ b/ChangeLog @@@ -1,444 -1,16 +1,457 @@@ + 2010-06-06 Stefano Lattarini + Ralf Wildenhues + + Fix distcheck failure with distributed generated parallel tests. + * tests/Makefile.am ($(parallel_tests)): Cope with $(srcdir) + being different from the value at developer `make dist' time. + * tests/defs.in: Protect against mutiple inclusion, by using ... + ($am_defs_included): ... this new variable. + ($srcdir): Do not compute, but simply define to `@abs_srcdir@' + as substituted by configure. + Report, suggestions and first fix by Ralf Wildenhues, final + patch by Stefano Lattarini. + +2010-06-06 Stefano Lattarini + + Improve tests link*.test (enable `errexit' shell flag). + * tests/link_c_cxx.test: Enable `errexit shell flag, and related + changes. Also, do not create useless source files. + * tests/link_dist.test: Likewise. + * tests/link_f90_only.test: Likewise. + * tests/link_f_only.test: Likewise. + * tests/link_fc.test: Likewise. + * tests/link_fccxx.test: Likewise. + * tests/link_fcxx.test: Likewise. + +2010-06-06 Ralf Wildenhues + + Improve ext.test semantics, avoid OpenBSD sh errexit issue. + * tests/ext.test: Inside shell compound command, use + `if $cmd; then Exit 1; fi' rather than `$cmd && Exit 1', to + fix failure with OpenBSD sh introduced with last patch. + Actually ensure that a rule for .EXT.o is created for each + known extension EXT. + +2010-06-06 Stefano Lattarini + + Enable `errexit' shell flag in some test scripts. + * tests/dash.test: Enable `errexit' shell flag, and related + changes. + * tests/defun.test: Likewise. + * tests/defun2.test: Likewise. + * tests/dejagnu.test: Likewise. + * tests/double.test: Likewise. + * tests/distcom2.test: Likewise. + * tests/empty2.test: Likewise. + * tests/empty3.test: Likewise. + * tests/empty4.test: Likewise. + * tests/exdir.test: Likewise. + * tests/ext.test: Likewise. + * tests/extra.test: Likewise. + * tests/extra2.test: Likewise. + * tests/extra3.test: Likewise. + * tests/extra4.test: Likewise. + * tests/flibs.test: Likewise. + * tests/fnoc.test: Likewise. + * tests/fo.test: Likewise. + * tests/instexec.test: Likewise. + * tests/ltdeps.test: Likewise. + * tests/nodep.test: Likewise. + * tests/nodepcomp.test: Likewise. + * tests/f90only.test: Likewise, and remove botched/obsoleted + comments and unecessary commands. + * tests/fonly.test: Likewise, and removed botched/obsolted + comments and unecessary commands. + * tests/discover.test: Likewise, and made stricter. + + Enable `errexit' shell flag in all tests cxx*.test. + * tests/cxx.test: Enabled `errexit' shell flag, and related + minor changes. + * tests/cxxansi.test: Likewise. + * tests/cxxcpp.test: Likewise. + * tests/cxxlibobj.test: Likewise. + * tests/cxxlink.test: Likewise. + * tests/cxxo.test: Likewise. + + Enable `errexit' shell flag in various tests. + * tests/acoutnoq.test: Enabled `errexit' shell flag, and related + minor changes. + * tests/acoutpt.test: Likewise. + * tests/acoutqnl.test: Likewise. + * tests/amassign.test: Likewise. + * tests/ansi2.test: Likewise. + * tests/ansi4.test: Likewise. + * tests/badprog.test: Likewise. + * tests/checkall.test: Likewise. + * tests/clean.test: Likewise. + * tests/colneq2.test: Likewise. + * tests/colon.test: Likewise. + * tests/colon5.test: Likewise. + * tests/colon6.test: Likewise. + * tests/comment.test: Likewise. + * tests/compile_f90_c_cxx.test: Likewise. + * tests/compile_f_c_cxx.test: Likewise. + * tests/cond3.test: Likewise. + * tests/cond6.test: Likewise. + * tests/cond13.test: Likewise. + * tests/conf2.test: Likewise. + * tests/confvar.test: Likewise. + * tests/confvar2.test: Likewise. + * tests/cond8.test: Likewise, plus a cosmetic change. + * tests/confh4.test: Likewise. Also, add in the heading comments + an excerpt from the original bug report which motivated the + creation of this test, to make its purpose clearer. + +2010-06-06 Ralf Wildenhues + + Rewrite manual to be gender-neutral. + * doc/automake.texi (GNU Build System) + (Standard Directory Variables, General Operation, CVS) + (Hard-Coded Install Paths, Dependencies As Side Effects): + Rewrite text to not contain gender-specific pronouns when + speaking about developers or users, either by avoiding pronouns + or by addressing them as `you' instead. + * THANKS: Update. + Report by Christina Gratorp. + + * AUTHORS: Update. + +2010-06-06 Stefano Lattarini + + Tiny fix in silent8.test (display output of `make' command). + * tests/silent8.test: Make sure that the captured output of `make' + command is always displayed. + + Make tests on user extensibility of silent-rules mode stricter. + * tests/silent6.test: Made stricter w.r.t. the grepping of the + output produced by `make'. + * tests/silent7.test: Likewise. + + Tests on silent-mode for C/Libtool made stricter. + * tests/silent.test: Made stricter w.r.t. the grepping of the + output produced by `make'. + * tests/silent2.test: Likewise. + * tests/silent4.test: Likewise. + * tests/silent9.test: Likewise. + * tests/silent3.test: Likewise, and add a final `make distclean' + command to keep it better in sync with tests/silent{4,9}.test. + + Improved test silent5.test. + * tests/silent5.test: Remove by hand all generated C files after + non-verbose builds, to ensure the following builds are clean. + Try to clean and rebuild with the same verbosity and without + removing generated sources in between, to check that this does + not trigger a different set of rules. Make grepping of make's + output stricter. Improved/added some comments. + + New tests for Automake silent-mode with Fortran. + * tests/silentf77.test: New test. + * tests/silentf90.test: Likewise. + * tests/Makefile.am (TESTS): Updated accordingly. + + New test `silentcxx.test' (Automake silent-mode with C++). + * tests/silentcxx.test: New test. + * tests/Makefile.am (TESTS): Updated accordingly. + + New test `silentyacc.test' (Automake silent-mode with Yacc). + * tests/silentyacc.test: New test. + * tests/Makefile.am (TESTS): Updated accordingly. + + New test `silentlex.test' (Automake silent-mode with Lex). + * tests/silentlex.test: New test. + * tests/Makefile.am (TESTS): Updated accordingly. + + Relax tests on silent-rules to cater to overly verbose makes. + * tests/silent.test: When testing silent builds, don't fail if + make's output simply contains the `mv' substring, but only if + it contains the `mv ' substring (note the trailing space). + * tests/silent2.test: Likewise. + * tests/silent3.test: Likewise. + * tests/silent4.test: Likewise. + * tests/silent5.test: Likewise. + * tests/silent9.test: Likewise. + +2010-05-23 Stefano Lattarini + + Extend test on `nostdinc' automake option. + * tests/nostdinc.test: Enable `errexit' shell flag. Related and + unrelated minor changes. Make the grepping of the generated + Makefile.in slighty stricter. Generate and run configure, so that + the generated Makefile can be grepped too. + +2010-05-23 Ralf Wildenhues + + Make gnupload portable to EBCDIC hosts. + * lib/gnupload: Use literal newline as argument for 'tr' rather + than \015, for EBCDIC hosts. Also, avoid unportable nested + double-quotes and backquotes. + * THANKS: Update. + Report from Eric Blake and Steve Goetze via gnulib. + +2010-05-23 Stefano Lattarini + + Fix Autoconf version required by Automake's configure. + Automake configure script used to tell that automake required + autoconf 2.60 or later, but then it checked for autoconf >= 2.62, + and if that was not found, it gave an error saying that Automake + required configure 2.61a-341 or later. This change should + eliminate such inconsistencies. + * configure.ac ($required_autoconf_version): New variable. + Use it throughout. + +2010-05-23 Ralf Wildenhues + + Fix truncated comment in Makefile.am. + * Makefile.am (sc_tests_logs_duplicate_prefixes): Fix unfinished + sentence in comment. + Report by Stefano Lattarini. + + Relax silent8.test for NetBSD make. + * tests/silent8.test: Accept ./foo.info in output as well. + + Fix unportable sed script in maintainer-check test. + * Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to + not contain semicolon after 'b' or brace commands, for NetBSD. + + Wildcards are not portable to NetBSD make. + * doc/automake.texi (Wildcards): Document portability issue. + * tests/extra10.test, tests/extra11.test, tests/extra12.test: + Require GNU make. + +2010-05-23 Stefano Lattarini + + Make test for configure.in vs. configure.ac stricter. + * tests/configure.test: Use a configure.in file that provokes + an automake error, to ensure configure.ac is preferred. + + Avoid possible false negatives in dejagnu7.test. + * tests/dejagnu7.test: Enable shell `errexit' flag. Also, avoid + unportable use of fgrep option `-e'. + + * tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE' + instead of respectively `test -e FILE' and `test ! -e FILE', + since Solaris Sh doesn't grok the latter. Do not SKIP the test + if the shell doesn't support `test -e'. + +2010-04-25 Ralf Wildenhues + + Warning and error message formatting cleanups. + * aclocal.in (parse_arguments, main): Remove trailing period or + newline in error or warning messages, avoid capitalization of + the first word of a message. + * automake.in (check_user_variables, handle_languages) + (handle_ltlibraries, scan_aclocal_m4, scan_autoconf_config_files) + (scan_autoconf_files, cond_stack_if, require_file_internal) + (usage, generate_makefile, parse_arguments): Likewise. + * lib/Automake/ChannelDefs.pm (set_strictness): Likewise. + * lib/Automake/Configure_ac.pm (find_configure_ac): Likewise. + * lib/Automake/Options.pm (set_strictness): Likewise. + * lib/Automake/Rule.pm (define): Likewise. + * lib/Automake/Variable.pm (define, variables_dump): Likewise. + * tests/ltinstloc.test, tests/suffix11.test: Adjust expected + error message. + * lib/Automake/Channels.pm (setup_channel): Reword error message + to be the same as in msg. + + Fix placing of ellipses in English text and synopses. + * Makefile.am: Be sure to add a space before `...' in natural + language text. + * automake.in (scan_autoconf_traces): Likewise. + * lib/Automake/Rule.pm (define): Likewise. + * lib/Automake/Variable.pm (define): Likewise. + * lib/am/dejagnu.am: Likewise. + * lib/am/progs.am: Likewise. + * lib/gnupload (dprint, upload): Likewise. + * tests/confdeps.test: Likewise. + * tests/location.test: Adjust expected output. + * automake.in (usage): In synopsis, use singular for OPTION, + * remove space before ellipsis. + * aclocal.in (usage): Likewise. Also, fix indentation. + + Fix more duplicate message prefixes. + * lib/Automake/XFile.pm (seek): Do not prepend $me. + ($me): Remove now-unused package-global. + * aclocal.in (check_acinclude): Remove duplicate 'warning: ' + prefix. + + Fix typo in manual. + * doc/automake.texi (Simple Tests using parallel-tests): Add + missing closing parenthesis. + + Fix leftover call to removed function macros_dump. + * automake.in (read_main_am_file): Call variables_dump, not + macros_dump. Print actual error before list of variables. + +2010-04-22 Stefano Lattarini + + Minor improvements in comments of test `silent3.test'. + * tests/silent3.test: Tell to keep it in sync with `silent9.test' + too. + +2010-04-25 Ralf Wildenhues + + testsuite: ensure verbose printing of captured output. + * tests/acloca14.test, tests/acloca18.test, tests/aclocal.test, + tests/fort2.test, tests/help.test, tests/missing3.test, + tests/missing6.test: Print captured stdout or stderr before + grepping it. + +2010-04-20 Stefano Lattarini + + Make test badopt.test stricter (by enabling `set -e'). + * tests/badopt.test: Add call to `set -e'. Due to this change, + an unexpected failure in the call to `$ACLOCAL' (whose outcome + was previously unchecked) would cause the whole test to fail. + Also, bumped the copyright years. + + Make test for configure.in vs. configure.ac stricter. + * tests/configure.test: Use a configure.in file that provokes + an automake error, to ensure configure.ac is preferred. + + Use `set -e' in confsub.test (avoids possible false negatives). + * tests/confsub.test: Enable shell `errexit' flag, and related + changes (this helps avoiding some possible minor false negatives). + Also, bumped copyright years. + +2010-04-20 Ralf Wildenhues + + Fix -Werror handling for presence of configure.in and configure.ac. + * lib/Automake/Variable.pm (Automake::Variable): Do not initialize + $configure_ac at the global level, before command-line arguments + have been parsed. + (require_variables): Initialize it here. + * tests/configure.test: New test. + * tests/Makefile.am: Update. + Report by Stefano Lattarini. + +2010-04-20 Stefano Lattarini + + Avoid possible false negatives in confh5.test. + * tests/confh5.test: Enable shell `errexit' flag, and bumped + copyright years. Due to this change, any unexpected failure + in calls to $ACLOCAL, $AUTOMAKE, $AUTOCONF or $AUTOHEADER, or + a failure in grepping expected text in output files should now + cause the whole test to fail. + +2010-04-17 Stefano Lattarini + + Fixed typo in POD documentation of Automake::Channels. + * lib/Automake/Channels.pm: Fixed typo in POD documentation: + @<...> was used instead of C<...>. + +2010-04-14 Stefano Lattarini + + Refactor tests on Automake TESTS color output. + * tests/color.test: Tests using the expect program moved out to... + * tests/color2.test: ... this new file. + * tests/Makefile.am (TESTS): Extended accordingly. + +2010-04-12 Stefano Lattarini + + Fix typos in comments in test confh5.test + * tests/confh5.test: Fix a couple of typos in comments. + + Avoid possible false negatives in canon-name.test. + * tests/canon-name.test: Enable shell `errexit' flag. Improve + test description. + +2010-04-11 Ralf Wildenhues + + Print 'warnings are treated as errors' note if needed. + * lib/Automake/Channels.pm: Fix typo in comment. + (_print_message): If -Werror is enabled, print a 'warnings are + treated as errors' note before the first such warning. + * tests/warnopts.test: Adjust comment to mention expected warning. + Adjust code to ignore 'warnings are treated as errors' note. + * tests/location.test: Adjust expected output with -Werror. + * tests/werror4.test: New test. + * tests/Makefile.am: Update. + * NEWS: Update. + + Ensure we don't print 'warning:' or 'error:' twice. + * Makefile.am (sc_ensure_testsuite_has_run): New helper rule. + (sc_tests_logs_duplicate_prefixes): New rule, to check for + wrong-looking warning and error messages in the test suite logs. + * aclocal.in (scan_configure_dep, scan_file): Remove duplicate + `warning: ' prefix. + * tests/vars3.test: Rename variable to avoid false positive. + + Prepend type to warning, error, and fatal messages. + For the first part of messages of types `error' or `fatal', + prepend `error: ' to the message. Prepend `warning: ' to + warning messages, whatever the setting of -Werror. + * lib/Automake/Channels.pm (partial): Move up definition. + (_format_message): Emit `header' and `footer' strings only with + the first resp. last part of a set of partial messages. + * lib/Automake/ChannelDefs.pm: Add missing '1;' statement at the + end of the module. + (Automake::ChannelDefs): Setup warning channels with header + `warning: ', error and fatal messages with header `error: '. + * tests/condinc2.test, tests/ltinstloc.test: Adjust expected + error messages. + * tests/comment5.test: Likewise. Also, include stack notes + should not start with `error:'. + * tests/location.test: Likewise. Also, try both -Werror and + -Wno-error. + * NEWS: Update. + Report by Bruno Haible. + + Fix capitalization of error messages, reword one message. + * lib/Automake/Variable.pm (define): Do not capitalize the first + word in the error message. + * automake.in (require_file_internal): Likewise. Also, reword + and line-wrap for better readability. + * tests/distcom7.test, tests/pluseq5.test, tests/pluseq9.test: + Adjust tests. + + Fix connected warnings about obsolete exeext override. + * lib/Automake/Rule.pm (define): Merge two warnings that belong + together, by setting the 'partial' flag for the first one. + + Fix per-Makefile.am setting of -Werror. + Before this patch, 'AUTOMAKE_OPTIONS = -Werror' in one + Makefile.am would carry over to other Makefile.am files + treated afterwards by the same thread, causing inconsistent + and unstable exit status values. + * lib/Automake/Channels.pm (dup_channel_setup) + (drop_channel_setup): Save and restore the setting of + $warnings_are_errors. + * tests/werror3.test: New test. + * tests/Makefile.am: Adjust. + * NEWS: Update. + +2010-04-11 Stefano Lattarini + + Bugfix in confh5.test w.r.t. Solaris/Heirloom Sh. + * tests/confh5.test: In the generated Makefile.am: do not use + `test ! -e FILE' to check for the non-existence of a file, since + that is not supported by Solaris/Heirloom Sh. + + Make test `aclocal3.test' stricter. + * tests/aclocal3.test: Add call to `set -e'. Fail if $ACLOCAL + succeds unexpectedly. + + Add tests checking that symlinks are resolved by `make dist'. + * tests/distlinks.test: New test. + * tests/Makefile.am (TESTS): Updated accordingly. + Suggested by observations from Ralf Wildenhues. + +2010-04-11 Ralf Wildenhues + + Use -9 for maximum xz compression with dist-xz. + * lib/am/distdir.am (dist-xz, dist, dist-all): Pass -9 to xz. + * NEWS, THANKS: Update. + Report by Pavel Sanda. + +2010-04-11 Stefano Lattarini + + Avoid possible false negatives in cond46.test. + * tests/cond46.test: Enable shell `errexit' flag (and bumped + copyright years). Due to this change, the testcase should now + fail on unexpected failures in calls to $ACLOCAL/$AUTOMAKE (whose + outcomes were previously unchecked), and on failures in grepping + the expected diagnostic in Automake stderr. + 2010-04-04 Stefano Lattarini Generated tests are now just a thin layer around other tests.