From: Stefano Lattarini Date: Tue, 11 Jan 2011 01:07:51 +0000 (+0100) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~272 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f00e5383376ff8acf2a571a1a979a4e188fb9b9;p=thirdparty%2Fautomake.git Merge branch 'maint' Conflicts: tests/instdir-texi.test tests/txinfo22.test --- 6f00e5383376ff8acf2a571a1a979a4e188fb9b9 diff --cc ChangeLog index f53d5c931,111590776..1d69f4bd4 --- a/ChangeLog +++ b/ChangeLog @@@ -1,119 -1,58 +1,174 @@@ + 2011-01-11 Stefano Lattarini + + Improve, extend and tweak tests on Texinfo support. + * tests/instdir-texi.test: Add a call to `ls -l' after that to + `make', for debugging. When looking for required tools, do not + redirect the output of "$tool --help" to /dev/null, and do not + uselessly run it in a subshell. + * tests/txinfo.test: Rewritten to run autoconf, ./configure and + make. All checks moved into Makefile.am. + * tests/txinfo8.test: Likewise, and modernize the generated + configure.in. + * tests/txinfo2.test: Moved checks into Makefile.am, and other + minor improvements. + * tests/txinfo5.test: Enable `errexit' shell flag, and related + changes. Add trailing `:' command. + * tests/txinfo6.test: Likewise, and make grepping of generated + Makefile.in stricter. + * tests/txinfo7.test: Enable `errexit' shell flag, and related + changes. Add trailing `:' command. Do not add unnecessary stuff + to Makefile.am. + * tests/txinfo9.test: Verify that more targets which are expected + to be generated only once really are. Make grepping less strict, + to avoid exposing too much internal details. More minor changes. + * tests/txinfo16.test: Add trailing `:'. Prefer cat over echo + for appending to configure.in. Updated/fixed heading comments. + * tests/txinfo23.test: Likewise, and extended a little by making + it check that no info file is created in the $(srcdir). + * tests/txinfo24.test: Likewise. + * tests/txinfo25.test: Likewise. + * tests/txinfo18.test: Add trailing `:'. Prefer cat over echo + for appending to configure.in. Also, check that index files are + cleaned also by "make clean", not only by "make distclean". + * tests/txinfo22.test: Prefer `$me' over hard-coded test name, + and added trailing `:' command. This testcase also used to check + that automake ignores in-line comments when using variables, but + preserves them in the output; these checks (added in commit + "Release-1-7f-4-g9177ef8") do not really pertain to this test, + so they have been moved ... + * tests/comments-in-var-defn.test: ... into this new test. + * tests/txinfo4.test: Escape literal dots in grep regexps. Add + trailing `:' command. + * tests/txinfo29.test: Likewise. Relax grepping of generated + Makefile.in w.r.t. whitespaces. Prefer `cat' over `echo' to + append to configure.in. + * tests/txinfo3.test: Likewise. + * tests/vtexi.test: Improve grepping of Makefile.in (sometimes + make it stricter, sometimes laxer). Move `set -e' setting just + after the inclusion of ./defs. De-uglify a sed command. Other + minor cosmetic improvements. + * tests/vtexi2.test: Make grepping of Makefile.in stricter. Add + trailing `:' command. + * tests/vtexi3.test: New test on version.texi support. + * tests/vtexi4.test: Likewise. + * tests/Makefile.am (TESTS): Updated. + +2011-01-11 Stefano Lattarini + + tests: fix spurious failure in 'tests/yflags-conditional.test' + * tests/yflags-conditional.test: Filter out message "warnings are + treated as errors" from automake stderr, to avoid a false positive + when grepping for extraneous warning messages. + +2011-01-10 Stefano Lattarini + + yacc: warn about conditional content in *YFLAGS variables + This change fixes automake bug#7804. + * automake.in (lang_yacc_target_hook): Warn if any of the relevant + *YFLAGS variables has conditional contents (not only a conditional + definition). Related refactoring. + * NEWS: Updated. + * tests/yflags-conditional.test: Updated and extended. + * tests/yflags-conditional-force.test: New test. + * tests/Makefile.am (TESTS): Updated. + +2011-01-08 Stefano Lattarini + + yacc: support variable expansions in *YFLAGS definition. + This change fixes automake bug#7800. + * automake.in (lang_yacc_target_hook): Use 'value_as_list_recursive' + instead of 'variable_value' to get the value of *YFLAGS variables. + Related changes. + ($DASH_D_PATTERN): Removed. + * tests/Makefile.am (XFAIL_TESTS): Remove yflags-var-expand.test. + * tests/yacc-clean.test: Remove workaround for now-fixed bug. + * NEWS: Update. + +2011-01-08 Stefano Lattarini + + yacc: more tests on *YFLAGS support + * tests/yflags-var-expand.test: New test, still xfailing. It + exposes automake bug#7800 -- "automake fails to honor `-d' in + AM_YFLAGS when variable expansions are involved". + * tests/yflags-d-false-positive.test: New test, checking that + automake do not spuriously see `-d' in *YFLAGS when that isn't + really there. + * tests/yflags-force-override.test: New test, checking that + automake can cope with definition of the YFLAGS variable in + Makefile.am (even if that is an extremely bad practice, as that + variable is user-reserved). + * tests/yflags-cmdline-override.test: New test, checking that + automake can cope with user-redefinition of YFLAGS at configure + time and/or at make time. + * tests/yflags-conditional.test: New test, checks that automake + warns on conditionally-defined *YFLAGS variables. + * tests/Makefile.am (TESTS, XFAIL_TESTS): Update. + +2011-01-08 Stefano Lattarini + + yacc: extend and improve tests + * tests/yacc-basic.test: Also check that the intermediate C file + is mentioned in the generated Makefile.in, and that it is created + by the first make invocation. + * tests/yacc3.test: Test removed, superseded by ... + * tests/yacc-d-basic.test: ... this new test. + * tests/yacc2.test: Add reference to that new test in the heading + comments. + * tests/yacc-d-vpath.test: New test. + * tests/yaccvpath.test: Updated heading comments. Do not require + gcc anymore, as any working C compiler should be enough. Remove + redundant comments. + * tests/yacc-nodist.test: New test. + * tests/yacc-dist-nobuild.test: New test. + * tests/Makefile.am (TESTS): Update. + +2010-12-13 Stefano Lattarini + + Extend, fix and improve tests on Lex and Yacc support. + * tests/lexcpp.test: New test script, on support for Lex + C++. + * tests/lexvpath.test: New test script, test build and rebuild + rules for lexers in VPATH setup. + * tests/yacc-basic.test: New test script, run simple "semantic" + checks on basic Yacc support (similarly to what lex3.test does + for Lex support). + * tests/lex.test: Don't create useless dummy source file joe.l. + Remove extra blank lines. + * tests/lex4.test: Add trailing `:' command. Do not create dummy + useless lex source file. + * tests/lex2.test: Likewise. Call automake with the `-a' option, + so that it doesn't fail for the absence of `ylwrap' script. Make + grepping of automake stderr stricter. + * tests/yacc7.test: Add trailing `:' command. Enable `errexit' + shell flag earlier (just after having sourced ./defs). + * tests/yacc4.test: Likewise. Also ... + (configure.in): Use pre-populated skeleton set up by ./defs, + instead of writing one from scratch. + Other minor cosmetic changes. + * tests/yacc5.test: Likewise. + * tests/yaccvpath.test: Likewise. Also ... + ($distdir): New variable. + Use it throughout. + * tests/lex5.test: Likewise. + * tests/lex3.test: Likewise. Check the distdir, rather than + grepping the distribution tarball. Extend the test on the + created binary, and be sure to avoid hangs. Add some comments. + * tests/yacc.test: Use stricter grepping. Add trailing `:'. + * tests/yacc6.test: Likewise. + * tests/yacc3.test: Likewise. Do not create the unused file + `Makefile.sed'. Remove useless rules from Makefile.am. Other + minor cosmetic changes. + * tests/yacc2.test: Make grepping of generated `Makefile.in' and + of automake error messages stricter. Do not redirect output of + grep to /dev/null. Move call to aclocal earlier. Reduce the + number of empty blank lines. Fix a typo in comments. + * tests/yacc8.test: Fixed bugs that reduced the completeness of + the tests. Added trailing `:' command. + (configure.in): Use pre-populated skeleton set up by ./defs, + instead of writing one from scratch. + * tests/yaccpp.test: Test also extensions `.y++', `.ypp', and + `.yxx', rather than only `.yy'. + * tests/Makefile.am (TESTS): Update. + 2011-01-09 Stefano Lattarini cosmetics: remove trailing whitespaces diff --cc tests/Makefile.am index 4b847f684,ceb503b89..ed42398cd --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -233,15 -158,11 +233,16 @@@ comment8.test comment9.test \ commen10.test \ commen11.test \ + comments-in-var-defn.test \ compile.test \ compile2.test \ +compile3.test \ +compile4.test \ +compile5.test \ +compile6.test \ compile_f90_c_cxx.test \ compile_f_c_cxx.test \ +cond-basic.test \ cond.test \ cond2.test \ cond3.test \ diff --cc tests/Makefile.in index f6bb63293,7ecfcaabd..84abf4daf --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -496,15 -425,11 +496,16 @@@ comment8.test comment9.test \ commen10.test \ commen11.test \ + comments-in-var-defn.test \ compile.test \ compile2.test \ +compile3.test \ +compile4.test \ +compile5.test \ +compile6.test \ compile_f90_c_cxx.test \ compile_f_c_cxx.test \ +cond-basic.test \ cond.test \ cond2.test \ cond3.test \ diff --cc tests/instdir-texi.test index b3e3c8463,8210535b9..75b6f822e --- a/tests/instdir-texi.test +++ b/tests/instdir-texi.test @@@ -20,12 -20,11 +20,11 @@@ required='makeinfo-html tex texi2dvi' . ./defs || Exit 1 +set -e + - (dvips --help 2>/dev/null >/dev/null) || Exit 77 - (pdfetex --help 2>/dev/null >/dev/null) || - (pdftex --help 2>/dev/null >/dev/null) || Exit 77 + dvips --help || Exit 77 + pdfetex --help || pdftex --help || Exit 77 -set -e - cat >>configure.in <<'END' AC_OUTPUT END diff --cc tests/txinfo22.test index 4adf47379,c2f23e176..731e37adc --- a/tests/txinfo22.test +++ b/tests/txinfo22.test @@@ -1,6 -1,6 +1,6 @@@ #! /bin/sh - # Copyright (C) 2003, 2004, 2007, 2008, 2010 Free Software Foundation, -# Copyright (C) 2003, 2004, 2007, 2008, 2011 Free Software Foundation, --# Inc. ++# Copyright (C) 2003, 2004, 2007, 2008, 2010, 2011 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