]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'ad-parallel-tests' into next
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 29 Mar 2009 00:21:01 +0000 (01:21 +0100)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 29 Mar 2009 00:21:01 +0000 (01:21 +0100)
* ad-parallel-tests:
  parallel-tests: New target recheck-html.
  parallel-tests: redo lazy checking: recheck and RECHECK_LOGS.
  parallel-tests: do not mark check-TESTS as `.MAKE'.
  parallel-tests: warn about $(srcdir), $(top_srcdir) in TESTS.
  check-html: Always create HTML output, note conversion failure.
  parallel-tests: per-extension test driver: <EXT>_LOG_COMPILER.
  parallel-tests: also record logs of SKIPped tests.
  Minor optimization in parallel-tests text box creation.

1  2 
ChangeLog
automake.in
doc/automake.texi
lib/Automake/tests/Makefile.in
tests/Makefile.am
tests/Makefile.in
tests/defs.in

diff --cc ChangeLog
index 62fda044b54d5df3eaf8cc48b8d4c318bd141244,cc711a0b747de9e8b1257177d09e22c6037446c5..2136a72275d8f54d760f5d36efdb3ad0b59c14b4
+++ b/ChangeLog
+ 2009-03-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+           Akim Demaille  <akim@lrde.epita.fr>
+       parallel-tests: New target recheck-html.
+       * lib/am/check.am [PARALLEL_TESTS] (recheck-html): New phony,
+       recursive target.  Factor common implementation with
+       `check-html'.
+       * doc/automake.texi (Tests): Document recheck-html.
+       * tests/parallel-tests2.test: Test it.
+ 2009-03-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+           Akim Demaille  <akim@lrde.epita.fr>
+       parallel-tests: redo lazy checking: recheck and RECHECK_LOGS.
+       Replace the LAZY_TEST_SUITE API with a simpler yet more powerful
+       one: RECHECK_LOGS specifies those tests which are to be removed
+       in any case before testing.  Provide a `recheck' convenience
+       target to set RECHECK_LOGS to all failed and unexpectedly passed
+       tests.  Document several ways to limit the set of tests run.
+       * lib/am/check.am [PARALLEL_TESTS] (RECHECK_LOGS): New variable,
+       default to $(TESTS_LOGS).
+       (check-TESTS): Remove $(RECHECK_LOGS) not $(TEST_LOGS).  Drop use
+       of LAZY_TEST_SUITE.
+       ($(TEST_SUITE_LOG)): Do not output note about lazy rerun, as
+       LAZY_TEST_SUITE is gone.
+       (recheck): New target.
+       (recheck-am, recheck-TESTS): New internal targets.
+       * doc/automake.texi (Tests): Update @vindex for TESTS and
+       TEST_LOGS.  Replace description of LAZY_TEST_SUITE with a list
+       of ways the set of tests to be run can be modified.  Document
+       RECHECK_LOGS and the recheck target.
+       * tests/defs.in: Unset RECHECK_LOGS not LAZY_TEST_SUITE.
+       * tests/parallel-tests.test: Adjust, replacing LAZY_TEST_SUITE
+       with corresponding RECHECK_LOGS settings.
+       * tests/parallel-tests9.test: New tests.
+       * tests/Makefile.am: Update.
+       Suggestion and different implementation by Akim Demaille.
+       parallel-tests: do not mark check-TESTS as `.MAKE'.
+       * lib/am/check.am [PARALLEL_TESTS] (.MAKE): Remove check-TESTS.
+       This rule removes files, which should not be executed with BSD
+       `make -n'.
+       parallel-tests: warn about $(srcdir), $(top_srcdir) in TESTS.
+       * automake.in (handle_tests): Warn about portability issue
+       concerning generated TESTS files listed with a `$(srcdir)/'
+       or `$(top_srcdir)/' prefix.
+       * doc/automake.texi (TESTS): Document this issue.  Mention that
+       the parallel-tests driver is still experimental.
+       * tests/parallel-tests8.test: New test.
+       * tests/Makefile.am: Update.
+       check-html: Always create HTML output, note conversion failure.
+       * lib/am/check.am (check-html): Create `$(TEST_SUITE_HTML)' in
+       any case.  Exit unsuccessfully if HTML creation failed.
+       * tests/parallel-tests2.test: Amend test to expose this.
+ 2009-03-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+       parallel-tests: per-extension test driver: <EXT>_LOG_COMPILER.
+       For test files with extension <ext>, introduce the internal
+       variable <EXT>_LOG_COMPILE, which expands to
+       $(<EXT>_LOG_COMPILER) $(AM_<EXT>_LOG_FLAGS) $(<EXT>_LOG_FLAGS).
+       Turn also the lib/Automake/tests testsuite over to the new
+       test driver.
+       * doc/automake.texi (Tests): Document `EXT_LOG_COMPILER' and
+       `EXT_LOG_FLAGS'.
+       * lib/am/check2.am: Insert `%COMPILE%' right before test.
+       * automake.in (handle_tests): Substitute `COMPILE' for check2,
+       empty for tests without extension, and `$(ext_LOG_COMPILE)' for
+       extension `ext'.  In the latter case, define it from the public
+       components.
+       * configure.ac (AM_INIT_AUTOMAKE): Use `parallel-test' globally.
+       * tests/Makefile.am (AUTOMAKE_OPTIONS): Remove, not needed here
+       any more.
+       * lib/Automake/tests/Makefile.am (TESTS_ENVIRONMENT): Split ...
+       (PL_LOG_COMPILER, PL_LOG_FLAGS): ... into these new variables.
+       (TESTS_EXTENSIONS): New variable, initialize to `.pl'.
+       * tests/parallel-tests7.test: New test.
+       * tests/Makefile.am: Update.
+       Suggestion by Akim Demaille.
+ 2009-03-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+       parallel-tests: also record logs of SKIPped tests.
+       * lib/am/check.am [PARALLEL_TESTS] ($(TEST_SUITE_LOG)): Record
+       SKIPs as well.
+       Suggested by Jim Meyering.
+       Minor optimization in parallel-tests text box creation.
+       * lib/am/check.am [PARALLEL-TESTS] (am__text_box): Use only one
+       awk invocation, rather than several tools, to create a text box.
+       Suggestion from Akim Demaille.
 +2009-03-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Rewrite maintainer-check in separate tests, parallelizable.
 +      * Makefile.am (sc_diff_automake_in_automake, sc_perl_syntax)
 +      (sc_no_brace_variable_expansions, sc_rm_minus_f)
 +      (sc_no_for_variable_in_macro, sc_mkinstalldirs)
 +      (sc_pre_normal_post_install_uninstall, sc_perl_no_undef)
 +      (sc_perl_no_split_regex_space, sc_cd_in_backquotes)
 +      (sc_cd_relative_dir, sc_perl_at_uscore_in_scalar_context)
 +      (sc_perl_local_no_parens, sc_perl_local)
 +      (sc_AMDEP_TRUE_in_automake_in, sc_tests_make_without_am_makeflags)
 +      (sc_tests_plain_make, sc_tests_plain_autoconf)
 +      (sc_tests_plain_autoupdate, sc_tests_plain_automake)
 +      (sc_tests_here_document_format, sc_tests_Exit_not_exit)
 +      (sc_tests_automake_fails, sc_tests_plain_aclocal)
 +      (sc_tests_plain_perl, sc_tests_required_after_defs)
 +      (sc_tests_overriding_macros_on_cmdline, sc_tests_plain_sleep)
 +      (sc_tests_plain_egrep_fgrep, sc_mkdir_p, sc_perl_at_substs)
 +      (sc_unquoted_DESTDIR, sc_tabs_in_texi, sc_at_in_texi): New rules,
 +      all phony, all listed in ...
 +      (syntax_check_rules): ... this new variable and split out from ...
 +      (maintainer-check): ... this rule.  Depend on $(syntax_check_rules).
 +
 +      * Makefile.am (maintainer-check): Do not complain if DESTDIR is
 +      passed as argument to `make'.
 +
 +      * doc/automake.texi (Cross-Compilation): Fix underfull hbox.
 +
 +      Sync auxiliary files from upstream.
 +      * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
 +      lib/texinfo.tex: Sync from upstream.
 +
 +2009-03-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      manual: minor cleanups.
 +      * doc/automake.texi (Yacc and Lex): Adjust spacing in example.
 +      (Mixing Fortran 77 With C and C++): Drop unneeded @page breaks.
 +
 +      Sane (un)install for empty directory variables.
 +      This patch fixes all install and uninstall rules to behave
 +      sanely when $(wheredir) is the empty string, but $(where_HOW) is
 +      nonempty, for all kinds of values of `where' and `HOW'.
 +      * lib/am/data.am (install-%DIR%%PRIMARY%, uninstall-%DIR%%PRIMARY%):
 +      Do not touch the install tree if the corresponding directory variable
 +      $(%NDIR%dir) is empty.
 +      * lib/am/java.am (install-%DIR%JAVA, uninstall-%DIR%JAVA): Likewise.
 +      * lib/am/libs.am (install-%DIR%LIBRARIES, uninstall-%DIR%LIBRARIES):
 +      Likewise.
 +      * lib/am/lisp.am (install-%DIR%LISP, uninstall-%DIR%LISP): Likewise.
 +      * lib/am/ltlib.am (install-%DIR%LTLIBRARIES, uninstall-%DIR%LTLIBRARIES):
 +      Likewise.
 +      * lib/am/mans.am (install-man%SECTION%, uninstall-man%SECTION%):
 +      Likewise.
 +      * lib/am/progs.am (install-%DIR%PROGRAMS, uninstall-%DIR%PROGRAMS):
 +      Likewise.
 +      * lib/am/python.am (install-%DIR%PYTHON, uninstall-%DIR%PYTHON):
 +      Likewise.
 +      * lib/am/scripts.am (install-%DIR%SCRIPTS, uninstall-%DIR%SCRIPTS):
 +      Likewise.
 +      * lib/am/texinfos.am (install-dvi-am, install-html-am, install-pdf-am)
 +      (install-ps-am, uninstall-dvi-am, uninstall-html-am, uninstall-pdf-am)
 +      (uninstall-ps-am): Likewise.
 +      * tests/instdir2.test, tests/instdir-java.test,
 +      tests/instdir-lisp.test, tests/instdir-ltlib.test,
 +      tests/instdir-prog.test, tests/instdir-python.test,
 +      tests/instdir-texi.test: New tests.
 +      * tests/Makefile.am: Update.
 +      * NEWS: Update.
 +      Suggestion by Akim Demaille.
 +
 +      Ensure that empty directory variables work with empty content variables.
 +      This test ensures that, if both $(wheredir) and $(where_HOW) are
 +      the empty string, then the `install' and `uninstall' rules behave
 +      sanely, for several directory variables `wheredir' and several
 +      primaries `HOW'.
 +      * tests/instdir.test: New test.
 +      * tests/Makefile.am: Update.
 +
 +2009-03-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Use --tag=FC with libtool also for .f90 files.
 +      * automake.in: Set 'libtool_tag' for language `fc'.
 +      * tests/fort5.test: Grep for the tag.
 +      * THANKS: Update.
 +      Report by John R. Cary.
 +
 +2009-03-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
 +          Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      For PR automake/533:
 +      DISTFILES containing a directory and files in that directory.
 +      When the source tree contains non-writable files or directories
 +      (as happens during distcheck), and directories or entries
 +      thereof are listed multiple times in variables to be
 +      distributed, then the corresponding directories below $(distdir)
 +      need to be made writable recursively.  Since file modes should
 +      not change, they need to be copied recursively using `cp -f'.
 +      * lib/am/distdir.am: Handle this situation.
 +      * tests/distdir.test: Extend test to those cases.
 +      * NEWS: Update.
 +      Report by Peter Breitenlohner.
 +
 +2009-03-22  Jim Meyering  <meyering@redhat.com>
 +
 +      Fix a documentation typo.
 +      * doc/automake.texi (Headers): Clarify the note telling when it's
 +      better not to use noinst_HEADERS.
 +
 +2009-03-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Define AM_RECURSIVE_TARGETS, for gnulib's GNUmakefile.
 +      This new macro lists all public targets which invoke `make'
 +      recursively, or depend on targets which do so.  It allows to
 +      prevent parallelism selectively, when multiple targets are
 +      passed on the `make' command line.
 +      * lib/am/distdir.am [%?SUBDIRS%] (AM_RECURSIVE_TARGETS): New
 +      macro.
 +      * lib/am/subdirs.am (AM_RECURSIVE_TARGETS): Likewise.
 +      * lib/am/tags.am [%?SUBDIRS%] (AM_RECURSIVE_TARGETS):
 +      Likewise.
 +
  2009-03-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Fix LAZY_TEST_SUITE handling and $(TEST_SUITE_LOG) recreation.
diff --cc automake.in
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tests/defs.in
Simple merge