]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 13 Aug 2012 12:05:40 +0000 (14:05 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 13 Aug 2012 12:05:40 +0000 (14:05 +0200)
* 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 <stefano.lattarini@gmail.com>
39 files changed:
1  2 
doc/automake.texi
lib/am/check.am
t/acloca22.sh
t/aclocal5.sh
t/check-subst.sh
t/color-tests.sh
t/color-tests2.sh
t/confh7.sh
t/confh8.sh
t/distcom4.sh
t/java-compile-run-flat.sh
t/java-compile-run-nested.sh
t/lisp5.sh
t/list-of-tests.mk
t/parallel-tests-dry-run-1.sh
t/parallel-tests-dry-run-2.sh
t/primary-prefix-valid-couples.sh
t/remake10c.sh
t/remake8a.sh
t/remake8b.sh
t/silent-many-gcc.sh
t/silent-many-generic.sh
t/silent-yacc.sh
t/silent.sh
t/silent2.sh
t/silent3.sh
t/silent4.sh
t/silent9.sh
t/silentcxx-gcc.sh
t/silentcxx.sh
t/silentf77.sh
t/silentf90.sh
t/subdir-add2-pr46.sh
t/txinfo23.sh
t/txinfo24.sh
t/txinfo25.sh
t/txinfo28.sh
t/txinfo33.sh
t/vtexi4.sh

index 76e84e0897e6a66389e23736fc1589bd3585ecd0,a168bb9116b84472fe97d37dfc8a3a650b48c8f4..e4614ab23702b468047d62962b09b18a4edd93a9
@@@ -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 lib/am/check.am
Simple merge
diff --cc t/acloca22.sh
Simple merge
diff --cc t/aclocal5.sh
Simple merge
index b743ca335099e5e128c26b5db42cba6ebb06c73a,b84762ed7874f37e5819a0cb5cb2fd99ce3b0d62..0b1aedaca314948875dcc9d5d9bd09fa242d445b
@@@ -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
Simple merge
Simple merge
diff --cc t/confh7.sh
Simple merge
diff --cc t/confh8.sh
Simple merge
diff --cc t/distcom4.sh
index c7088eb7212b6f34b3f1a6ff4ec01bed33776ccb,8786ca2cb3e897649d4970e2ff0225a22b45677e..691c19721771e13bb0377fc7192bc96c83d0459c
@@@ -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
  
index 05cf89ab2465e5fd90cf1a528eaff47bc8a61407,c04f4d9979ee3aa3fe0caef332c9f16bcbd5d3a9..7d228bb1f8ed8ea9035a60ce3a3f88d4774230fc
@@@ -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
index f6bb2173f7d2854a5dd38ad4d113e2ee453351c0,1448952f5c403d0cde5f7a233a7b469a36c44131..9c0958cdd1709e5d04e5e3c91bc92f316ec6ee83
  # 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/lisp5.sh
Simple merge
Simple merge
index 382ae206bf0b950ee66bd026b30676608df043b0,376a81a42ed1933d0c2ce33ced25028e4b5611a1..96764c31e42ba256a51c4dd84a325f908388cbe1
@@@ -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 <http://www.gnu.org/licenses/>.
  
 -# 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
  
index 11a0f459afae03c969700c38ef0b029d731ca246,d041d2d211637555d920c2adab32a31bef0811e5..0d324d8ed6c689c0ce9a1f0ac7bc1112a07ed858
@@@ -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 <http://www.gnu.org/licenses/>.
  
 -# 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
  
Simple merge
diff --cc t/remake10c.sh
Simple merge
diff --cc t/remake8a.sh
Simple merge
diff --cc t/remake8b.sh
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/silent.sh
Simple merge
diff --cc t/silent2.sh
Simple merge
diff --cc t/silent3.sh
Simple merge
diff --cc t/silent4.sh
Simple merge
diff --cc t/silent9.sh
Simple merge
Simple merge
diff --cc t/silentcxx.sh
Simple merge
diff --cc t/silentf77.sh
Simple merge
diff --cc t/silentf90.sh
Simple merge
Simple merge
diff --cc t/txinfo23.sh
index 9e47a29d794e09bd6c5a5fbcd95da0818342a01a,294370bd83a60efd7d0522065aec9f0c7a4ef1af..c2d582a866722606256ea576fb5174ec4afd2948
  
  # 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 af426d73c02ca65b59b793abf262e7f5e7a79a90,ae3e8abb62d18211a21b653c2f827300214fc5c0..6979215088d899fe9be6228dec2899ecf74f5568
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  # 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 6eb1975fac91342b3ec986c6a52245c001fc1a5c,4feedca19ca3227cb26d9810b8a0f0ed8f83956f..e23f53781237e0739da2c2458be78b1bf6dae32f
  # 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/txinfo28.sh
Simple merge
diff --cc t/txinfo33.sh
index 037400f43741588905cad4020b44304aec89af2a,efb2678e28f02c4caf49ae425ea7edc0218197e9..a55b5ed533f3f97265b7e0e079af18bab7a49580
@@@ -15,9 -15,9 +15,9 @@@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  # 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
diff --cc t/vtexi4.sh
Simple merge