From: Stefano Lattarini Date: Fri, 9 Dec 2011 23:46:13 +0000 (+0100) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~94 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47587d15b0749575e95a49443c6b0e17e0722678;p=thirdparty%2Fautomake.git Merge branch 'maint' Commits merged from maint: dist-xz, dist-bzip2: don't hard-code -9, honor envvar settings news: fix typos, grammaros and suboptimal wording maint: sync auxiliary files from upstream tests: fix spurious failures due to missing 'yywrap()' function depcomp: spelling fix tests: fix 'distcheck-override-infodir.test' on Cygwin cosmetics: typofix in comments coverage: undistributed '.am' and '.m4' files are diagnosed coverage: required but missing '.am' and '.m4' files are diagnosed coverage: expose automake bug#10111 in the testsuite fix: regenerate doc/Makefile texinfo: work around Solaris 10 xpg4 shell bug in install rules configure: report perl version in config.log tests: fix spurious failure with older install-info maintcheck: fix spurious failure in 'color2.test' tests: fix spurious error in 'uninstall-fail.test' on Solaris tests: fix typo in 'uninstall-fail.test' Extra edits: * ChangeLog: Remove mention of commit 6da46f31 (2010-10-05), which has been superseded by commit c8e01d58 (2011-12-09). Fix entry relative to that commit, to adapt to differences between maint and master. --- 47587d15b0749575e95a49443c6b0e17e0722678 diff --cc ChangeLog index 5420f9271,618ab0209..228a48cc3 --- a/ChangeLog +++ b/ChangeLog @@@ -1,7 -1,182 +1,184 @@@ + 2011-12-09 Jim Meyering + Stefano Lattarini + + dist-xz, dist-bzip2: don't hard-code -9, honor envvar settings + Before the present change, automake-generated `dist-xz' rule used + a hard-coded `xz -9'. That was a problem because on this front, + xz differs from gzip and bzip2. While the latter two don't incur + any run-time decompression penalty for using a higher compression + level, specifying -9 with xz imposes a potentially fatal virtual + memory requirement on any client that wants to decompress your + tar.xz file. + People have complained that a tarball compressed with -9 cannot + be uncompressed in a low-memory environment (wrt-based embedded). + Hence, instead of defaulting to -9, which is useful only for very + large tarballs, it defaults to -e (equivalent to -6e). This + limits the default memory requirements imposed on decompressors, + yet still gives very good compression ratios. + * lib/am/distdir.am (dist-xz): Do not hard-code xz's -9: that made + it impossible to override. Actually don't default to -9, either, + since that induced inordinately large virtual memory usage when + merely decompressing. Instead, use its XZ_OPT envvar, defaulting + to -e if not defined. Suggested by Lasse Collin. - (dist, dist-all) [?XZ?]: Likewise + (dist-bzip2): Similarly, do not hard-code -9, but do continue to + use -9 by default. Honor the BZIP2 envvar. - (dist, dist-all) [?BZIP2?]: Likewise + * NEWS: Update. + * doc/automake.texi (The Types of Distributions): Describe the + newly enabled environment variables. + + 2011-12-09 Stefano Lattarini + + * NEWS: Fix typos, grammaros and suboptimal wording. + Reported by Jim Meyering. + + 2011-12-07 Stefano Lattarini + + maint: sync auxiliary files from upstream + * lib/texinfo.tex: Synced from upstream, by "make fetch". + * lib/config.guess: Likewise. + * lib/config.sub: Likewise. + + 2011-12-04 Stefano Lattarini + + tests: fix spurious failures due to missing 'yywrap()' function + + The AC_PROG_LEX Autoconf macro does not diagnose a failure to find + the "lex library" expected to provide a `yywrap' function (function + which is required to link most lex-generated programs). On the + contrary, when all the link attempts (i.e., with `-ll' and `-lfl') + fail, configure declares that no lex library is needed, and simply + proceeds with the configuration process -- only for the build to + possibly fail later, at make time. + + This behaviour is intended; the Autoconf manual reads: + ``You are encouraged to use Flex in your sources, since it is + both more pleasant to use than plain Lex and the C source it + produces is portable. In order to ensure portability, however, + you must either provide a function `yywrap' or, if you don't use + it (e.g., your scanner has no `#include'-like feature), simply + include a `%noyywrap' statement in the scanner's source.'' + + This AC_PROG_LEX behaviour is causing some spurious failures of + the Automake testsuite in environments which lack a proper library + providing `yywrap' (this happens for example on Fedora-based + systems). The proper workaround is to simply provide a fall-back + implementation of `yywrap' in our lexers. + + See also partially-overlapping commit `v1.11-871-geb147a1' (from + the 'testsuite-work' branch), which was motivated by similar + spurious failures experienced when cross-compiling. + + From a report by Jim Meyering: + + + * tests/cond35.test: Provide a dummy `yywrap' function. + * tests/lex3.test: Likewise. + * tests/silent-lex-generic.test: Likewise. + * tests/silent-lex-gcc.test: Likewise. + * tests/silent-many-generic.test: Likewise. + * tests/silent-many-gcc.test: Likewise. + + 2011-12-04 Paul Eggert + + depcomp: spelling fix + * lib/depcomp (-h): Fix misspelling in usage diagnostic. + + 2011-11-28 Peter Rosin + + tests: fix 'distcheck-override-infodir.test' on Cygwin + * tests/distcheck-override-infodir.test (Makefile.am): Do not add + any `/' between $(DESTDIR) and the following paths. Otherwise, + when $(DESTDIR) is empty, the recipes will try to access files + with a leading double slash, which have an implementation-defined + interpretation (e.g., for Cygwin, they mean UNC paths). + + 2011-11-24 Stefano Lattarini + + cosmetics: typofix in comments + * tests/remake-am-pr10111.test (Makefile.am): Fix typo in comments. + * THANKS: Update. + Reported by Krzysztof Żelechowski. + + 2011-11-22 Stefano Lattarini + + coverage: undistributed '.am' and '.m4' files are diagnosed + The stub rules emitted to work around the "deleted header problem" + for `.m4' files (included by autoconf in e.g., configure.ac) and + for `.am' files (included by automake in e.g., Makefile.am) should + not prevent "make" from correctly complaining when such a required + file is missing from a distribution tarball. + * tests/dist-missing-am.test: New test. + * tests/dist-missing-m4.test: Likewise. + * tests/dist-missing-included-m4.test: Likewise. + * tests/Makefile.am (TESTS): Add them. + Suggestion by Ralf Wildenhues. + + 2011-11-22 Stefano Lattarini + + coverage: required but missing '.am' and '.m4' files are diagnosed + The stub rules emitted to work around the "deleted header problem" + for `.m4' files (included by autoconf in e.g., configure.ac) and + for `.am' files (included by automake in e.g., Makefile.am) should + not prevent the remake rules from correctly erroring out when a + still-required file is missing. + * tests/deleted-am.test: New test. + * tests/deleted-m4.test: Likewise. + * tests/Makefile.am (TESTS): Add them. + + 2011-11-22 Stefano Lattarini + + coverage: expose automake bug#10111 in the testsuite + * tests/remake-am-pr10111.test: New test, xfailing. + * tests/remake-m4-pr10111.test: Likewise. + * tests/Makefile.am (TESTS, XFAIL_TESTS): Add them. + + 2011-11-19 Stefano Lattarini + + texinfo: work around Solaris 10 xpg4 shell bug in install rules + * lib/am/texinfos.am (install-html-am): Use an extra variable + indirection to work around a bug in Solaris 10 /usr/xpg4/bin/sh. + Bug revealed by a failure of `txinfo21.test'. See also: + + + + 2011-11-17 Stefano Lattarini + + configure: report perl version in config.log + * configure.ac: Report the version of the selected perl interpreter + in config.log; this should render the logs more informative. + + 2011-11-13 Stefano Lattarini + + tests: fix spurious failure with older install-info + * tests/install-info-dir.test (foo.texi): Also add proper + `@settitle', `@dircategory' and `@direntry' directive, otherwise + older versions of `install-info' (e.g., 4.8) will fail to create + the `dir' index file in ${infodir}. + Problem revealed by a failure on NetBSD 5.1. + + 2011-11-12 Stefano Lattarini + + maintcheck: fix spurious failure in 'color2.test' + * tests/color2.test: Avoid creative quoting to avoid a spurious + failure of the `sc_tests_Exit_not_exit' maintainer check. + + 2011-11-12 Stefano Lattarini + + tests: fix spurious error in 'uninstall-fail.test' on Solaris + * tests/uninstall-fail.test: Solaris 10 /usr/xpg4/bin/sh can add + a line number before the `:' in the error messages issued by shell + builtins. Account for that in our grepping of make output. + + 2011-11-12 Stefano Lattarini + + tests: fix typo in 'uninstall-fail.test' + * tests/uninstall-fail.test: Always use `$rm_f_is_silent_on_error' + instead of the bogus `$rm_f_is_silent_on_failure'. + +2011-11-19 Paul Eggert + + * lib/install-sh: Spelling fix in comment. + 2011-11-10 Stefano Lattarini tests: avoid a spurious failure of 'ltinit.test' MinGW @@@ -4543,28 -2495,6 +4720,15 @@@ * 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. + * 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. + - 2010-10-05 Jim Meyering - - 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. - 2010-10-04 Stefano Lattarini Add support for newer python versions. diff --cc Makefile.in index 24a6c7fe1,e4756939b..ac04a36da --- a/Makefile.in +++ b/Makefile.in @@@ -726,11 -676,11 +726,11 @@@ dist-lzip: distdi dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--9} xz -c >$(distdir).tar.xz - $(am__post_remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z diff --cc NEWS index 6c548d1f7,790fabf78..da9af0808 --- a/NEWS +++ b/NEWS @@@ -32,35 -27,11 +32,35 @@@ New in 1.11a - The `lzma' compression scheme and associated automake option `dist-lzma' is obsoleted by `xz' and `dist-xz' due to upstream changes. + - "make dist" can now create lzip-compressed tarballs. + - You may adjust the compression options used in dist-xz and dist-bzip2. - The default is still -9 for each, but you may specify a different - level via the XZ_OPT and BZIP2 envvars respectively. E.g., - "make dist-xz XZ_OPT=-7" or "make dist-xz BZIP2=-5" + The default is now merely -e for xz, but still -9 for bzip; you may + specify a different level via the XZ_OPT and BZIP2 envvars respectively. + E.g., "make dist-xz XZ_OPT=-7" or "make dist-xz BZIP2=-5" + - Messages of types warning or error from `automake' and `aclocal' are now + prefixed with the respective type, and presence of -Werror is noted. + + - The `compile' script now converts some options for MSVC for a better + user experience. Similarly, the new `ar-lib' script wraps Microsoft lib. + + - Automake's early configure-time sanity check now tries to avoid sleeping + for a second, which slowed down cached configure runs noticeably. In that + case, it will check back at the end of the configure script to ensure that + at least one second has passed, to avoid time stamp issues with makefile + rules rerunning autotools programs. + + - For programs and libraries, automake now detects EXTRA_foo_DEPENDENCIES and + adds them to the normal list of dependencies, but without overwriting the + foo_DEPENDENCIES variable, which is normally computed by automake. + + - C source and header files derived from non-distributed Yacc sources are + now removed by "make clean", not only by "make maintainer-clean". + + - The `compile' script now converts some options for MSVC for a better + user experience. Similarly, the new `ar-lib' script wraps Microsoft lib. + - The py-compile script now accepts empty arguments passed to the options `--destdir' and `--basedir', and complains about unrecognized options. Moreover, a non-option argument or a special `--' argument terminates @@@ -71,14 -42,9 +71,14 @@@ the developer-reserved makefile variable AM_DISTCHECK_CONFIGURE_FLAGS, instead of the old DISTCHECK_CONFIGURE_FLAGS. The DISTCHECK_CONFIGURE_FLAGS variable should now be reserved for the - user; still, the old Makefile.am files that used to define it should + user; still, the old Makefile.am files that used to define it will still continue to work as before. + - New macro AM_PROG_AR that looks for an archiver and wraps it in the new + 'ar-lib' auxiliary script if the found archiver is Microsoft lib. This + new macro is required for LIBRARIES and LTLIBRARIES when automake is + run with -Wextra-portability (or -Wall) and -Werror. + - When using DejaGnu-based testsuites, the user can extend the `site.exp' file generated by automake-provided rules by defining the special make variable `$(EXTRA_DEJAGNU_SITE_CONFIG)'. @@@ -141,18 -101,13 +139,18 @@@ Bugs fixed in 1.11a - AM_PROG_GCJ uses AC_CHECK_TOOLS to look for `gcj' now, so that prefixed tools are preferred in a cross-compile setup. + - The distribution is tarred up with mode 755 now by the `dist*' targets. + This fixes a race condition where untrusted users could modify files + in the $(PACKAGE)-$(VERSION) distdir before packing if the toplevel + build directory was world-searchable. This is CVE-2009-4029. + - - Several scripts as well as the parallel-tests testsuite driver now - exit with the right exit status upon receiving a signal. + - Several scripts and the parallel-tests testsuite driver now exit with + the right exit status upon receiving a signal. - - A per-Makefile.am setting of -Werror does not carry over to the - handling of other Makefile.am files any more. + - A per-Makefile.am setting of -Werror does not erroneously carry over + to the handling of other Makefile.am files. - - The order of Yacc and Lex flags is fixed to be consistent with other + - The order of Yacc and Lex flags is now consistent with that of other languages: $(AM_YFLAGS) comes before $(YFLAGS), and $(AM_LFLAGS) before $(LFLAGS), so that the user variables override the developer variables. @@@ -164,31 -119,13 +162,31 @@@ make bug triggered by sources containing repeated slashes when the `subdir-objects' option was used. + - Automake now detects the presence of the `-d' flag in the various + `*YFLAGS' variables even when their definitions involve indirections + through other variables, such as in: + foo_opts = -d + AM_YFLAGS = $(foo_opts) + + - Automake now complains if a `*YFLAGS' variable has any conditional + content, not only a conditional definition. + + - Explicit enabling and/or disabling of Automake warning categories + through the `-W...' options now always takes precedence over the + implicit warning level implied by Automake strictness (foreign, gnu + or gnits), regardless of the order in which such strictness and + warning flags appear. For example, a setting like: + AUTOMAKE_OPTIONS = -Wall --foreign + will cause the warnings in category `portability' to be enabled, even + if those warnings are by default disabled in `foreign' strictness. + - - The parallel-tests driver now does not produce erroneous results - with Tru64/OSF 5.1 sh upon unreadable log files any more. + - The parallel-tests driver no longer produces erroneous results with + Tru64/OSF 5.1 sh upon unreadable log files. - - The makedepend and hp depmodes now works better with VPATH builds. + - The makedepend and hp depmodes now work better with VPATH builds. - - Java sources specified with check_JAVA are not compiled anymore upon - "make all", but only upon "make check". + - Java sources specified with check_JAVA are no longer compiled for + "make all", but only for "make check". - An usage like "java_JAVA = foo.java" will now cause Automake to warn and error out if `javadir' is undefined, instead of silently producing diff --cc lib/depcomp index 9825d56d7,5621fd4df..bd0ac0895 --- a/lib/depcomp +++ b/lib/depcomp @@@ -1,10 -1,10 +1,10 @@@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects - scriptversion=2011-04-16.09; # UTC + scriptversion=2011-12-04.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2011, -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 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 diff --cc tests/Makefile.am index 471b340a5,831906b72..cf1bc927d --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -884,17 -726,10 +888,19 @@@ remake-subdir-gnu.test remake-subdir.test \ remake-subdir2.test \ remake-subdir-long-time.test \ +remake-gnulib-add-acsubst.test \ +remake-gnulib-add-header.test \ +remake-gnulib-remove-header.test \ +remake-moved-m4-file.test \ +remake-deleted-m4-file.test \ +remake-renamed-m4-file.test \ +remake-renamed-m4-macro-and-file.test \ +remake-renamed-m4-macro.test \ + remake-am-pr10111.test \ + remake-m4-pr10111.test \ pr8365-remake-timing.test \ regex.test \ +regex-obsolete.test \ req.test \ reqd.test \ reqd2.test \ diff --cc tests/Makefile.in index 1fe51cd05,3ad0146e4..3e2171051 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -299,84 -287,46 +299,85 @@@ target_alias = @target_alias top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -XFAIL_TESTS = \ -all.test \ -auxdir2.test \ -cond17.test \ -dist-auxfile.test \ -dist-auxfile-2.test \ -gcj6.test \ -java-nobase.test \ -pr8365-remake-timing.test \ -lex-subobj-nodep.test \ -remake-am-pr10111.test \ -remake-m4-pr10111.test \ -vala-vpath.test \ -txinfo5.test - -parallel_tests = \ -check-concurrency-bug9245-p.test \ -check-exported-srcdir-p.test \ -check-tests-in-builddir-p.test \ -check-tests_environment-p.test \ -check-p.test \ -check10-p.test \ -check11-p.test \ -check2-p.test \ -check3-p.test \ -check4-p.test \ -check5-p.test \ -check6-p.test \ -check7-p.test \ -check8-p.test \ -check9-p.test \ -color-p.test \ -color2-p.test \ -comment9-p.test \ -dejagnu-p.test \ -exeext4-p.test \ -maken3-p.test \ -maken4-p.test - -MAINTAINERCLEANFILES = $(parallel_tests) +MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests) +EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \ + $(TESTS) distcheck-hook-m4.am +XFAIL_TESTS = all.test auxdir2.test cond17.test dist-auxfile.test \ + dist-auxfile-2.test gcj6.test override-conditional-2.test \ + java-nobase.test pr8365-remake-timing.test \ - lex-subobj-nodep.test vala-vpath.test txinfo5.test \ ++ lex-subobj-nodep.test remake-am-pr10111.test \ ++ remake-m4-pr10111.test vala-vpath.test txinfo5.test \ + $(instspc_xfail_tests) +parallel_tests = backcompat5-p.test check-concurrency-bug9245-p.test \ + check-exported-srcdir-p.test check-tests-in-builddir-p.test \ + check-tests_environment-p.test check-p.test check10-p.test \ + check11-p.test check12-p.test check2-p.test check3-p.test \ + check4-p.test check5-p.test check6-p.test check7-p.test \ + check8-p.test check9-p.test color-p.test color2-p.test \ + comment9-p.test dejagnu-p.test exeext4-p.test maken3-p.test \ + maken4-p.test posixsubst-tests-p.test +instspc_tests = instspc-squote-build.test instspc-squote-install.test \ + instspc-dquote-build.test instspc-dquote-install.test \ + instspc-bquote-build.test instspc-bquote-install.test \ + instspc-sharp-build.test instspc-sharp-install.test \ + instspc-dollar-build.test instspc-dollar-install.test \ + instspc-bang-build.test instspc-bang-install.test \ + instspc-bslash-build.test instspc-bslash-install.test \ + instspc-ampersand-build.test instspc-ampersand-install.test \ + instspc-percent-build.test instspc-percent-install.test \ + instspc-leftpar-build.test instspc-leftpar-install.test \ + instspc-rightpar-build.test instspc-rightpar-install.test \ + instspc-pipe-build.test instspc-pipe-install.test \ + instspc-caret-build.test instspc-caret-install.test \ + instspc-tilde-build.test instspc-tilde-install.test \ + instspc-qmark-build.test instspc-qmark-install.test \ + instspc-star-build.test instspc-star-install.test \ + instspc-plus-build.test instspc-plus-install.test \ + instspc-minus-build.test instspc-minus-install.test \ + instspc-comma-build.test instspc-comma-install.test \ + instspc-colon-build.test instspc-colon-install.test \ + instspc-semicol-build.test instspc-semicol-install.test \ + instspc-equal-build.test instspc-equal-install.test \ + instspc-less-build.test instspc-less-install.test \ + instspc-more-build.test instspc-more-install.test \ + instspc-at-build.test instspc-at-install.test \ + instspc-lqbrack-build.test instspc-lqbrack-install.test \ + instspc-rqbrack-build.test instspc-rqbrack-install.test \ + instspc-lcbrack-build.test instspc-lcbrack-install.test \ + instspc-rcbrack-build.test instspc-rcbrack-install.test \ + instspc-space-build.test instspc-space-install.test \ + instspc-tab-build.test instspc-tab-install.test \ + instspc-linefeed-build.test instspc-linefeed-install.test \ + instspc-backspace-build.test instspc-backspace-install.test \ + instspc-formfeed-build.test instspc-formfeed-install.test \ + instspc-carriageret-build.test \ + instspc-carriageret-install.test \ + instspc-quadrigraph0-build.test \ + instspc-quadrigraph0-install.test \ + instspc-quadrigraph1-build.test \ + instspc-quadrigraph1-install.test \ + instspc-quadrigraph2-build.test \ + instspc-quadrigraph2-install.test \ + instspc-quadrigraph3-build.test \ + instspc-quadrigraph3-install.test \ + instspc-quadrigraph4-build.test \ + instspc-quadrigraph4-install.test instspc-a_b-build.test \ + instspc-a_b-install.test instspc-a__b-build.test \ + instspc-a__b-install.test instspc-a_lf_b-build.test \ + instspc-a_lf_b-install.test instspc-dotdotdot-build.test \ + instspc-dotdotdot-install.test instspc-dosdrive-build.test \ + instspc-dosdrive-install.test instspc-miscglob1-build.test \ + instspc-miscglob1-install.test instspc-miscglob2-build.test \ + instspc-miscglob2-install.test +instspc_xfail_tests = instspc-squote-build.test \ + instspc-dquote-build.test instspc-bquote-build.test \ + instspc-sharp-build.test instspc-dollar-build.test \ + instspc-bslash-build.test instspc-ampersand-build.test \ + instspc-linefeed-build.test instspc-quadrigraph0-build.test \ + instspc-a_lf_b-build.test instspc-squote-install.test \ + instspc-dquote-install.test instspc-bquote-install.test \ + instspc-sharp-install.test instspc-dollar-install.test \ + instspc-linefeed-install.test instspc-a_lf_b-install.test # Some testsuite-influential variables should be overridable from the # test scripts, but not from the environment. @@@ -1160,17 -1010,10 +1163,19 @@@ remake-subdir-gnu.test remake-subdir.test \ remake-subdir2.test \ remake-subdir-long-time.test \ +remake-gnulib-add-acsubst.test \ +remake-gnulib-add-header.test \ +remake-gnulib-remove-header.test \ +remake-moved-m4-file.test \ +remake-deleted-m4-file.test \ +remake-renamed-m4-file.test \ +remake-renamed-m4-macro-and-file.test \ +remake-renamed-m4-macro.test \ + remake-am-pr10111.test \ + remake-m4-pr10111.test \ pr8365-remake-timing.test \ regex.test \ +regex-obsolete.test \ req.test \ reqd.test \ reqd2.test \ diff --cc tests/lex3.test index 4714472dc,c0af6b2b3..a947aca98 --- a/tests/lex3.test +++ b/tests/lex3.test @@@ -46,14 -52,12 +46,20 @@@ cat > foo.l << 'END int main () { - while (yylex () != EOF) - ; + /* We don't use a 'while' loop here (like a real lexer would do) + to avoid possible hangs. */ + if (yylex () == EOF) + return 0; + else + return 1; +} - return 0; ++/* Avoid possible link errors. */ ++int yywrap (void) ++{ ++ return 1; + } + /* Avoid possible link errors. */ int yywrap (void) {