* t/distcheck-override-infodir.sh (main.texi): Remove all leading cruft added by commit v1.12.2-96-g133307b "maintcheck: fix spurious warnings".
Signed-off-by: Peter Rosin <p...@lysator.liu.se> --- t/distcheck-override-infodir.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Hi! I ran the 1.12.3 testsuite on a fairly up-to-date Cygwin, and got this: $ make check TESTS=t/distcheck-override-infodir VERBOSE=yes make check-TESTS check-local make[1]: Entering directory `/home/peda/src/automake-1.12.3/cygwin' make[2]: Entering directory `/home/peda/src/automake-1.12.3/cygwin' FAIL: t/distcheck-override-infodir.sh make[3]: Entering directory `/home/peda/src/automake-1.12.3/cygwin' make[3]: Nothing to be done for `all'. make[3]: Leaving directory `/home/peda/src/automake-1.12.3/cygwin' =========================================== GNU Automake 1.12.3: ./test-suite.log =========================================== # TOTAL: 1 # PASS: 0 # SKIP: 0 # XFAIL: 0 # FAIL: 1 # XPASS: 0 # ERROR: 0 .. contents:: :depth: 2 FAIL: t/distcheck-override-infodir ================================== distcheck-override-infodir: running makeinfo --version makeinfo (GNU texinfo) 4.13 Copyright (C) 2008 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. distcheck-override-infodir: running texi2dvi --version texi2dvi (GNU Texinfo 4.13) 1.135 Copyright (C) 2008 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. distcheck-override-infodir: running install-info --version install-info (GNU texinfo) 4.13 Copyright (C) 2008 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Running from installcheck: no Test Protocol: none PATH = /home/peda/src/automake-1.12.3/cygwin/t/wrap:/home/peda/src/automake-1.12.3/cygwin/t/ax:/home/peda/src/automake-1.12.3/cygwin/../t/ax:/usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0:/cygdrive/c/Program Files (x86)/Carmenta/Carmenta Engine 5 SDK/bin:/cygdrive/c/Windows/idmu/common:/usr/lib/lapack ++ pwd /home/peda/src/automake-1.12.3/cygwin/t/distcheck-override-infodir.dir + cat + cat + sed 's/^ #//' + aclocal-1.12 -Werror + automake-1.12 --foreign -Werror -Wall -a Makefile.am: error: './main.texi' missing @setfilename Makefile.am:2: installing './texinfo.tex' + am_exit_trap 1 + exit_status=1 + set +e + cd /home/peda/src/automake-1.12.3/cygwin + test none = tap + case $am_explicit_skips in + test 1 -eq 0 + keep_testdirs=yes + am_keeping_testdirs + case $keep_testdirs in + return 0 + set +x distcheck-override-infodir: exit 1 ============================================================================ Testsuite summary for GNU Automake 1.12.3 ============================================================================ # TOTAL: 1 # PASS: 0 # SKIP: 0 # XFAIL: 0 # FAIL: 1 # XPASS: 0 # ERROR: 0 ============================================================================ See ./test-suite.log Please report to bug-autom...@gnu.org ============================================================================ Makefile:2906: recipe for target `test-suite.log' failed make[2]: *** [test-suite.log] Error 1 make[2]: Leaving directory `/home/peda/src/automake-1.12.3/cygwin' Makefile:3012: recipe for target `check-TESTS' failed make[1]: *** [check-TESTS] Error 2 make[1]: Leaving directory `/home/peda/src/automake-1.12.3/cygwin' Makefile:3252: recipe for target `check-am' failed make: *** [check-am] Error 2 Ok to push this fix to maint? Cheers, Peter diff --git a/t/distcheck-override-infodir.sh b/t/distcheck-override-infodir.sh index 74f6c67..eb41a37 100755 --- a/t/distcheck-override-infodir.sh +++ b/t/distcheck-override-infodir.sh @@ -39,7 +39,7 @@ installcheck-local: END # Protect with leading " # " to avoid spurious maintainer-check failures. -sed 's/^ #//' > main.texi << 'END' +sed 's/^ # //' > main.texi << 'END' # \input texinfo # @setfilename main.info # @settitle main -- 1.7.9