]> git.ipfire.org Git - thirdparty/libtool.git/commitdiff
Merge branch 'parallel-tests'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Fri, 27 Aug 2010 05:31:49 +0000 (07:31 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Fri, 27 Aug 2010 05:32:22 +0000 (07:32 +0200)
* parallel-tests:
  check-interactive and check-noninteractive for both testsuites.
  Adjust docs for renaming and for parallel-tests.
  Update VERBOSE handling for parallel-tests driver.
  Enable parallel-tests test driver for the old testsuite.
  New alias scripts for old tests run more than once.
  Require Automake 1.11.1 for Libtool, enable color-tests.

1  2 
ChangeLog
Makefile.am
configure.ac

diff --cc ChangeLog
index 4f1120451136886400f7bd02197eee6946a68f00,75b2298482e0cef3bddb8aaecbfec500385fb34b..99bc5aac7bbcd8ce35a7671ff0e44dbc12e8d57c
+++ b/ChangeLog
 -2010-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
++2010-08-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+       check-interactive and check-noninteractive for both testsuites.
+       * Makefile.am (COMMON_TESTS, TESTS): Split into ...
+       (NONINTERACTIVE_TESTS, INTERACTIVE_TESTS): ... these new
+       variables.
+       (check-interactive-new): Rename from check-interactive.
+       (check-noninteractive-new): Rename from check-noninteractive.
+       (check-interactive-old, check-noninteractive-old): New targets.
+       (check-interactive, check-noninteractive): Depend on the
+       respective targets for the old and the new test suites.
+       * doc/libtool.texi (Test descriptions): Simplify description
+       about check-interactive and check-noninteractive.  Add index
+       entries.
+       Adjust docs for renaming and for parallel-tests.
+       * README: Update example TESTS setting.
+       * README.alpha: Likewise.
+       * doc/libtool.texi (Test descriptions): Update for test renaming,
+       adjust descriptions accordingly.
+       Update VERBOSE handling for parallel-tests driver.
+       * tests/defs.m4sh: Default to verbose output, drop now-unneeded
+       handling of 'VERBOSE=no'.
+       * README: Update example usage.
+       * README.alpha: Likewise.
+       * doc/libtool.texi (Test descriptions, When tests fail): Remove
+       unneeded VERBOSE recommendations.  Point to per-test log files
+       and test-suite.log summary file.
+       Enable parallel-tests test driver for the old testsuite.
+       * configure.ac: New configure test to find out whether `make'
+       supports order-only prerequisites; set @ORDER@ accordingly.
+       (AM_INIT_AUTOMAKE): Enable parallel-tests option.
+       * tests/defs.m4sh (prefix): Derive install prefix for tests
+       from the test name, to avoid clashes.
+       * Makefile.am (CXX_TESTS, F77_TESTS, FC_TESTS, COMMON_TESTS):
+       Reformat.  Adjust for renamed tests.  Add dependencies between
+       the respective log files of the tests, to ensure proper ordering.
+       Use order-only dependencies if possible, between test groups that
+       use the same directory.
+       (clean-local-legacy): Remove `_inst-*' directories as well.
+       Prompted by suggestion from Bob Friesenhahn.
+       New alias scripts for old tests run more than once.
+       * tests/cdemo-shared-exec.test, tests/cdemo-shared-make.test,
+       tests/cdemo-static-exec.test, tests/cdemo-static-make.test,
+       tests/cdemo-undef-exec.test, tests/cdemo-undef-make.test,
+       tests/demo-nofast-exec.test, tests/demo-nofast-inst.test,
+       tests/demo-nofast-make.test, tests/demo-nofast-unst.test,
+       tests/demo-nopic-exec.test, tests/demo-nopic-make.test,
+       tests/demo-pic-exec.test, tests/demo-pic-make.test,
+       tests/demo-shared-exec.test, tests/demo-shared-inst.test,
+       tests/demo-shared-make.test, tests/demo-shared-unst.test,
+       tests/demo-static-exec.test, tests/demo-static-inst.test,
+       tests/demo-static-make.test, tests/demo-static-unst.test,
+       tests/depdemo-nofast-exec.test, tests/depdemo-nofast-inst.test,
+       tests/depdemo-nofast-make.test, tests/depdemo-nofast-unst.test,
+       tests/depdemo-shared-exec.test, tests/depdemo-shared-inst.test,
+       tests/depdemo-shared-make.test, tests/depdemo-shared-unst.test,
+       tests/depdemo-static-exec.test, tests/depdemo-static-inst.test,
+       tests/depdemo-static-make.test, tests/depdemo-static-unst.test,
+       tests/f77demo-shared-exec.test, tests/f77demo-shared-make.test,
+       tests/f77demo-static-exec.test, tests/f77demo-static-make.test,
+       tests/fcdemo-shared-exec.test, tests/fcdemo-shared-make.test,
+       tests/fcdemo-static-exec.test, tests/fcdemo-static-make.test,
+       tests/mdemo-shared-exec.test, tests/mdemo-shared-inst.test,
+       tests/mdemo-shared-make.test, tests/mdemo-shared-unst.test,
+       tests/mdemo-static-exec.test, tests/mdemo-static-inst.test,
+       tests/mdemo-static-make.test, tests/mdemo-static-unst.test,
+       tests/tagdemo-shared-exec.test, tests/tagdemo-shared-make.test,
+       tests/tagdemo-static-exec.test, tests/tagdemo-static-make.test,
+       tests/tagdemo-undef-exec.test, tests/tagdemo-undef-make.test:
+       New files.
+       Require Automake 1.11.1 for Libtool, enable color-tests.
+       * configure.ac (AM_INIT_AUTOMAKE): Require 1.11.1.  Enable
+       color-tests.
+       (LTDL_SUBDIR_LIBOBJS): Remove now-obsolete conditional and
+       feature test for Autoconf 2.59 and Automake 1.9.x workaround.
+       * Makefile.am: Simplify accordingly.
+       * bootstrap: Remove obsolete WORKING_LIBOBJ_SUPPORT workarounds
+       for Autoconf 2.59 and Automake 1.9.6.
 +2010-08-23  Charles Wilson  <libtool@cwilson.fastmail.fm>
 +
 +      Fix syntax for cygwin-cross
 +      libltdl/m4/argz.m4: Add quotes around variable, which
 +      may contain the multiword value 'guessing no'.
 +
 +2010-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      configure: use Autobuild AB_INIT if available.
 +      * configure.ac: Call AB_INIT if it is defined, with
 +      $autobuild_mode as argument, to be set at configure time.
 +      Set AB_VERSION to the Libtool version string.
 +      * HACKING: Update.
 +
 +      Fix getopt tests to skip with Autoconf < 2.61.
 +      * tests/getopt-m4sh.at (_LT_AT_GETOPT_M4SH_SETUP): Skip the test
 +      if 'autom4te --language=m4sh' exits 63 because version 2.61 is
 +      required.  Allows the testsuite to complete successfully with
 +      Autoconf 2.59 and Automake 1.9.6.
 +
 +      Tidy and fix clean and distclean rules for old testsuite.
 +      * Makefile.am (clean-local-legacy): Use $(CONF_SUBDIRS) instead
 +      of hard-coding the list of test directories.  Use
 +      $(AM_MAKEFLAGS).
 +      (fake-distclean-legacy): New phony rule, to create fake Makefile
 +      files if needed so that the automake-generated
 +      distclean-recursive rule can work properly.
 +      (distclean_recursive): New helper variable.
 +      (distclean-recursive): Depend on fake-distclean-legacy.
 +
 +2010-08-22  Paolo Bonzini  <bonzini@gnu.org>
 +
 +      Fix sed_make_literal_regex.
 +      * libltdl/config/general.m4sh (sed_make_literal_regex): Fix
 +      definition.
 +
 +2010-08-15  Paolo Bonzini  <bonzini@gnu.org>
 +
 +      Factor the sed command used to make a regex from a literal.
 +      * libltdl/config/general.m4sh (sed_make_literal_regex): New.
 +      * libltdl/config/ltmain.m4sh
 +      (func_cygming_dll_for_implib_fallback_core): Use it.  Suggested
 +      by Ralf Wildenhues.
 +
  2010-08-21  Rainer Tammer <tammer@tammer.net>  (tiny change)
  
        Avoid issues with AIX resident shared libraries in old testsuite.
diff --cc Makefile.am
index 2c4a3db7fccbc80ce272df74cddb09c80662880c,3df40fdb28f705d64bc6d57bf8ef27459047e2e0..85bad6a6f1c0c4819052fdd3eeb55d6ac77df9b2
@@@ -712,26 -907,12 +907,26 @@@ $(srcdir)/tests/defs.in: $(auxdir)/gene
  
  # We need to remove any files that the above tests created.
  clean-local-legacy:
 -      -cd tests; \
 -      for dir in cdemo demo depdemo f77demo fcdemo mdemo mdemo2 pdemo tagdemo; \
 -      do \
 -          test -f $$dir/Makefile && ( cd $$dir && $(MAKE) distclean; ); \
 +      -for dir in $(CONF_SUBDIRS); do \
 +        if test -f $$dir/Makefile; then \
 +          (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) distclean); \
 +        else :; fi; \
        done
-       rm -rf _inst
+       rm -rf _inst _inst-*
  
 +# For distclean, we may have to fake Makefiles in the test directories
 +# so that descending in DIST_SUBDIRS works.
 +# Hide the additional dependency from automake so it still outputs the rule.
 +distclean_recursive = distclean-recursive
 +$(distclean_recursive): fake-distclean-legacy
 +.PHONY: fake-distclean-legacy
 +fake-distclean-legacy:
 +      -for dir in $(CONF_SUBDIRS); do \
 +        if test ! -f $$dir/Makefile; then \
 +          $(mkinstalldirs) $$dir; \
 +          echo 'distclean: ; rm -f Makefile' > $$dir/Makefile; \
 +        else :; fi; \
 +      done
 +
  $(TESTS): tests/defs
  DISTCLEANFILES += tests/defs
diff --cc configure.ac
index 9690a056737c5ef570d3429e11083eeff7a5e467,609051c69466df475d43ed4cdd9cf5f486946e8d..1a0db91791a8f3017ce5a013bfc0df9ed05f931f
@@@ -125,21 -125,9 +125,22 @@@ AC_SUBST([package_revision]
  
  dnl These are bootstrap requirements! Once built, libtool may work with
  dnl much older releases of autoconf and automake.  See release notes.
- AM_INIT_AUTOMAKE([1.10.1 gnu subdir-objects dist-lzma])
+ dnl 1.11 is needed for color-tests, 1.11.1 fixes a security issue.
+ AM_INIT_AUTOMAKE([1.11.1 gnu subdir-objects dist-lzma color-tests parallel-tests])
  
 +
 +## ------------------------- ##
 +## Autobuild initialisation. ##
 +## ------------------------- ##
 +
 +# You can set autobuild_mode at configure time to specify a "unique"
 +# string for this build.
 +: ${autobuild_mode=default}
 +AB_VERSION="AC_PACKAGE_VERSION ($TIMESTAMP)"
 +m4_ifdef([AB_INIT],
 +       [AB_INIT([$autobuild_mode])])
 +
 +
  dnl We use m4sh to generate libtool's portable shell scripts
  AC_SUBST([M4SH], ['$(AUTOM4TE) --language=m4sh'])