]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'tests-suffix-extend'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 23 Dec 2010 20:41:45 +0000 (21:41 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 23 Dec 2010 20:41:45 +0000 (21:41 +0100)
Conflicts:
tests/suffix10.test

1  2 
ChangeLog
NEWS
automake.in
doc/automake.texi
tests/Makefile.am
tests/Makefile.in

diff --cc ChangeLog
index 0540fc8644b47c6b00043b62d79cf12445fe9870,a3076fae3db79488f20a9f56035eba46c2440564..39a42a62392133625ed149fa0ed294ab475c804b
+++ b/ChangeLog
+ 2010-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       Improve and extend tests `suffix*.test'.
+       * tests/suffix.test: Check that suffix rules for C compilation are
+       only included once.  Try also with a static library.
+       * tests/suffix2.test: Add a new grep to help potential debugging.
+       Do not run automake with the `--add-missing' options, since we
+       already create all the needed auxiliary files.  Try also *without*
+       the `no-dependencies' automake option.
+       * tests/suffix4.test: Make grepping of Makefile.in stricter.
+       * tests/suffix3.test: Rewritten to run also autoconf, ./configure
+       and make.
+       * tests/suffix5.test: Likewise.
+       * tests/suffix6.test: Fix botched recipe indentation (eight spaces
+       were used instead of a tabulation character).  Extend to check
+       that `.obj' is handled like `.$(OBJEXT)' (as is done for `.o').
+       Improved parsing & grepping of generated Makefile.in.  Other minor
+       fixes and improvements.
+       * tests/suffix10.test: Move some checks in Makefile.am.  Also run
+       "make all".
+       * tests/suffix12.test: Likewise, and account for VPATH issues in
+       weaker make implementations.
+       * tests/suffix11.test: Likewise.  Also, run "make distcheck", for
+       completeness, and related changes.
+       * tests/suffix8.test: Likewise.  Also, do not put `gcc' anymore
+       in $required.
+       * tests/suffix13.test: Do not use the `--force-missing' automake
+       option unnecessarily.
+       * tests/suffix6b.test: New test, semantic sister of `suffix6.test'.
+       * tests/suffix6c.test: Likewise.
+       * tests/Makefile.am (TESTS): Updated.
+ 2010-12-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+           Stefano Lattarini  <stefano.lattarini@gmail.com>
+       Work around a bug in file-inclusion mechanism of Solaris make.
+       * automake.in (handle_single_transform): In the name of the
+       dependency file: collapse multiple slash characters into a single
+       one.
+       * tests/subobj11a.test: New test.
+       * tests/subobj11b.test: Likewise.
+       * tests/subobj11c.test: Likewise.
+       * tests/depcomp8a.test: Likewise.
+       * tests/depcomp8b.test: Likewise.
+       * tests/Makefile.am (TESTS): Updated.
+       * NEWS: Updated.
+       Report by Stefano Lattarini, quick fix by Ralf Wildenhues, final
+       patch and tests by Stefano Lattarini.
+ 2010-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       Fix two spurious testsuite failures on IRIX 6.5.
+       * tests/suffix13.test (Makefile.am): Account for VPATH issues on
+       weaker make implementations (e.g. IRIX 6.5).
+       * tests/parallel-tests8.test: Likewise, plus a required related
+       change.
+       Reported by Ralf Wildenhues.  The bugs have been there from the
+       first versions of the affected test scripts.
+ 2010-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       docs: cygnus mode doesn't require AM_CYGWIN32 macro.
+       * doc/automake.texi (Cygnus): Mode 'cygnus' does not require
+       the AM_CYGWIN32 macro (and indeed hasn't required it since at
+       least commit Release-1-2-31-g3038064 "merged changes from
+       Cygnus" of 1997-08-25).
 +2010-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Add some tests on 'cygnus' mode.
 +      * tests/clean2.test: Extend.
 +      * tests/cygnus-check-without-all.test: New test.
 +      * tests/cygnus-dependency-tracking.test: Likewise.
 +      * tests/cygnus-distclean.test: Likewise.
 +      * tests/cygnus-imply-foreign.test: Likewise.
 +      * tests/cygnus-no-dist.test: Likewise.
 +      * tests/cygnus-no-installinfo.test: Likewise.
 +      * tests/cygnus-requires-maintainer-mode.test: Likewise.
 +      * tests/Makefile.am (TESTS): Update.
 +
 +2010-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Fix parallel testsuite run with Zsh.
 +      This change deals with a Zsh incompatibility in the handling
 +      of the special shell variable `$0' in sourced files; this
 +      incompatibility used to cause utter breakage when the
 +      Automake testsuite was run in parallel mode with Zsh as
 +      the $(TEST_LOG_COMPILER).
 +      For more information, please refer to the thread "Fix parallel
 +      testsuite run with zsh" on automake-patches, dated 2010-12-22:
 +       <http://lists.gnu.org/archive/html/automake-patches/2010-12/msg00135.html>
 +      This change works around the problems described above for Zsh 4.3
 +      or later, and offers better error messages (instead of random
 +      failures) for earlier Zsh version.
 +      * tests/README (Supported shells): When describing the manual
 +      workaround about the Zsh incompatibility in the handling of `$0',
 +      tell that it is now needed only with Zsh versions preceding 4.3.
 +      Done also some minor rewordings.
 +      * tests/defs-static.in ($argv0): New variable, offers a workaround
 +      for the Zsh incompatibility in the handling of `$0'.
 +      Abort if that variable cannot be correctly set (can happen only
 +      in older Zsh version).
 +      * tests/defs ($me): Define using `$argv0', not `$0'.
 +
 +2010-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Tests defs: keep track of original $AUTOMAKE and $ACLOCAL values.
 +      This is especially useful for tests which might want to run
 +      automake and aclocal without additional flags and warnings.
 +      * tests/defs-static.in ($original_ACLOCAL): New variable.
 +      ($original_AUTOMAKE): Likewise.
 +      * tests/help.test: Use them.
 +      * tests/help2.test: Likewise.
 +      * tests/help3.test: Likewise.
 +      * tests/help4.test: Likewise.
 +      From a suggestion by Ralf Wildenhues.
 +
  2010-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        distlinksbrk.test: Work around botched "make -k".
diff --cc NEWS
Simple merge
diff --cc automake.in
index 27904f01e932759b82af5bfb3c474f641dcc7a7d,bf45fa7321834adb89af072c284f67d0c7ce157f..bb30c738bfd1297687ca554e4db280e256918e32
mode 100644,100755..100644
Simple merge
Simple merge
Simple merge