From: Stefano Lattarini Date: Mon, 13 Aug 2012 12:05:40 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: v1.12b~58 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6cc38027572445a25d749db99473f82521cc79e;p=platform%2Fupstream%2Fautomake.git Merge branch 'maint' * maint: tests: rework tests on AM_PATH_PYTHON cosmetics: fix typos and references in comments typofix: in a test diagnostic readme: fixlets to HACKING Signed-off-by: Stefano Lattarini --- c6cc38027572445a25d749db99473f82521cc79e diff --cc doc/automake.texi index 76e84e0,a168bb9..e4614ab --- a/doc/automake.texi +++ b/doc/automake.texi @@@ -9433,10 -9513,10 +9433,10 @@@ The only recognized test results are cu @code{SKIP}, @code{FAIL}, @code{XPASS} and @code{ERROR}. These results, when declared with @code{:test-result:}, can be optionally followed by text holding the name and/or a brief description of the corresponding -test; the @option{parallel-tests} harness will ignore such extra text when -generating @file{test-suite.log} and preparing the testsuite summary. +test; the harness will ignore such extra text when generating +@file{test-suite.log} and preparing the testsuite summary. - @c Keep in sync with 'test-metadata-recheck.test'. + @c Keep in sync with 'test-metadata-recheck.sh'. @item @code{:recheck:} @cindex :recheck: @cindex reStructuredText field, @code{:recheck:} diff --cc t/check-subst.sh index b743ca3,b84762e..0b1aeda --- a/t/check-subst.sh +++ b/t/check-subst.sh @@@ -16,8 -16,8 +16,8 @@@ # Check @substituted@ TESTS. # Note that in this test, we rely on the .test extension for the -# substituted names: this is necessary for parallel-tests. +# substituted names: this is necessary for the parallel harness. - # See also sister test 'check-subst-prog.test'. + # See also sister test 'check-subst-prog.sh'. # For gen-testsuite-part: ==> try-with-serial-tests <== . ./defs || exit 1 diff --cc t/distcom4.sh index c7088eb,8786ca2..691c197 --- a/t/distcom4.sh +++ b/t/distcom4.sh @@@ -16,8 -16,9 +16,8 @@@ # Test to make sure config files are distributed, and only once. # This tries to distribute a file from a subdirectory, without - # Makefile in that directory. distcom5.test performs the same + # Makefile in that directory. 'distcom5.sh' performs the same # test with a Makefile in the directory. -# Also make sure that README appears first in DIST_COMMON. . ./defs || exit 1 diff --cc t/java-compile-run-flat.sh index 05cf89a,c04f4d9..7d228bb --- a/t/java-compile-run-flat.sh +++ b/t/java-compile-run-flat.sh @@@ -19,9 -19,9 +19,9 @@@ # "UNIX-style" use case. # This test uses a "flat" setup for the source tree (i.e., everything in # the top-level directory), and forces the use of the old, non-parallel - # testsuite driver. The sister test 'java-compile-run-nested.test' do + # testsuite driver. The sister test 'java-compile-run-nested.sh' do -# similar checks with a more usual, "nested" setup, and using the newer -# 'parallel-tests' driver. +# similar checks with a more usual, "nested" setup, and using the older +# 'serial-tests' driver. required='java javac' am_serial_tests=yes diff --cc t/java-compile-run-nested.sh index f6bb217,1448952..9c0958c --- a/t/java-compile-run-nested.sh +++ b/t/java-compile-run-nested.sh @@@ -18,11 -18,11 +18,11 @@@ # Also meddle with wrapper scripts, as would be probably seen in a real # "UNIX-style" use case. # This test uses a typical "nested" source tree setup (i.e., different -# components/aspects are separated into different subdirectories), -# and uses the 'parallel-tests' testsuite driver. The sister test -# 'java-compile-run-flat.sh' do similar checks with a "flat" setup -# (i.e., everything in the top-level directory), and forcing the use -# of the older non-parallel 'simple-tests' driver. +# components/aspects are separated into different subdirectories), and +# uses the parallel testsuite driver. - # The sister test 'java-compile-run-flat.test' do similar checks with a - # "flat" setup (i.e., everything in the top-level directory), and forcing - # the use of the older 'serial-tests' driver. ++# The sister test 'java-compile-run-flat.sh' do similar checks with ++# a "flat" setup (i.e., everything in the top-level directory), and ++# forcing the use of the older 'serial-tests' driver. required='java javac' . ./defs || exit 1 diff --cc t/parallel-tests-dry-run-1.sh index 382ae20,376a81a..96764c3 --- a/t/parallel-tests-dry-run-1.sh +++ b/t/parallel-tests-dry-run-1.sh @@@ -14,8 -14,8 +14,8 @@@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Check parallel-tests interactions with "make -n". +# Check interactions between the parallel test harness and "make -n". - # See also sister test 'parallel-tests-dry-run-2.test'. + # See also sister test 'parallel-tests-dry-run-2.sh'. . ./defs || exit 1 diff --cc t/parallel-tests-dry-run-2.sh index 11a0f45,d041d2d..0d324d8 --- a/t/parallel-tests-dry-run-2.sh +++ b/t/parallel-tests-dry-run-2.sh @@@ -14,8 -14,8 +14,8 @@@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Check parallel-tests interactions with "make -n". +# Check interactions between the parallel test harness and "make -n". - # See also sister test 'parallel-tests-dry-run-1.test'. + # See also sister test 'parallel-tests-dry-run-1.sh'. . ./defs || exit 1 diff --cc t/txinfo23.sh index 9e47a29,294370b..c2d582a --- a/t/txinfo23.sh +++ b/t/txinfo23.sh @@@ -16,10 -16,10 +16,10 @@@ # Check that info files are built in builddir when needed. # Test with subdir Texinfo. - # (Similar to txinfo13.test, plus DISTCLEANFILES). - # (See also txinfo24.test and txinfo25.test). + # (Similar to txinfo13.sh, plus DISTCLEANFILES). + # (See also txinfo24.sh and txinfo25.sh). -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' . ./defs || exit 1 cat >> configure.ac << 'END' diff --cc t/txinfo24.sh index af426d7,ae3e8ab..6979215 --- a/t/txinfo24.sh +++ b/t/txinfo24.sh @@@ -15,10 -15,10 +15,10 @@@ # along with this program. If not, see . # Check that info files are built in builddir when needed. - # (Similar to txinfo16.test, plus CLEANFILES). - # (See also txinfo23.test and txinfo25.test). + # (Similar to txinfo16.sh, plus CLEANFILES). + # (See also txinfo23.sh and txinfo25.sh). -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' . ./defs || exit 1 cat >> configure.ac << 'END' diff --cc t/txinfo25.sh index 6eb1975,4feedca..e23f537 --- a/t/txinfo25.sh +++ b/t/txinfo25.sh @@@ -17,10 -17,10 +17,10 @@@ # Check that info files are built in builddir and in srcdir can safely # co-exist. This setup is obtained by having two info files, only one # of which being cleaned. - # (Similar to txinfo16.test, plus CLEANFILES). - # (See also txinfo23.test and txinfo24.test). + # (Similar to txinfo16.sh, plus CLEANFILES). + # (See also txinfo23.sh and txinfo24.sh). -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' . ./defs || exit 1 cat >> configure.ac << 'END' diff --cc t/txinfo33.sh index 037400f,efb2678..a55b5ed --- a/t/txinfo33.sh +++ b/t/txinfo33.sh @@@ -15,9 -15,9 +15,9 @@@ # along with this program. If not, see . # DVIS, PDFS, PSS, HTMLS should not be cleaned upon 'mostlyclean'. - # Similar to txinfo25.test. + # Similar to txinfo25.sh. -required='makeinfo tex texi2dvi-o dvips' +required='makeinfo tex texi2dvi dvips' . ./defs || exit 1 mkdir sub