]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'master' into testsuite-work
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 20 May 2011 22:08:02 +0000 (00:08 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 20 May 2011 22:08:02 +0000 (00:08 +0200)
* master:
  testsuite: avoid re-running few tests with 'parallel-tests' option
  testsuite: allow tests to avoid the use of 'parallel-tests' option
  tests/README: update obsoleted advice

1  2 
ChangeLog
tests/Makefile.in
tests/gen-parallel-tests
tests/pr401.test
tests/pr401b.test
tests/pr401c.test

diff --cc ChangeLog
index bf260073022db165198cd90382cda4b544d5969a,4c436e5e250dfffdc8638550abb4d00e19130caa..3f93d4111900d6fe7f894ce472f6a0c386a84beb
+++ b/ChangeLog
+ 2011-05-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       testsuite: avoid re-running few tests with 'parallel-tests' option
+       Some tests in our testsuite use the 'simple-tests' driver only
+       marginally, or simply as a mean to conveniently check unrelated
+       invariants.  It makes little sense to force these tests to also
+       run with the 'parallel-tests' Automake option active, as doing so
+       offers no real gain in coverage, while often causing a measurable
+       overhead in execution time (for an already too-slow testsuite).
+       * tests/pr401.test (parallel_tests): Define to "no", to prevent
+       the generation of a sibling test script using the 'parallel-tests'
+       driver.
+       * tests/pr401b.test: Likewise.
+       * tests/pr401c.test: Likewise.
+ 2011-05-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       testsuite: allow tests to avoid the use of 'parallel-tests' option
+       * tests/gen-parallel-tests: Do not generate "siblings" for tests
+       that explicitly define the `parallel_tests', whether to "yes" or
+       to any other value.  Extend heading comments to give a rationale
+       for this behaviour.
+       * tests/README: Update.
+ 2011-05-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       tests/README: update obsoleted advice
+       * tests/README (Section "Writing test cases" subsection "Do"):
+       Do not suggest to use the `*-p.test' pattern for the names of
+       hand-written tests which use the `parallel-tests' Automake option.
+       Not only is this not respected by the existing tests, but it is
+       more likely to cause conflicts with auto-generated tests.
+       So, suggest to *avoid* using the `*-p.test' pattern in names
+       of hand-written tests instead.
+       (Section "Writing test cases" subsection "Do not"):  When
+       suggesting not to override Makefile variables using command
+       line arguments, do not use the badly outdated variables `U'
+       and 'ANSI2KNR' in the example; instead, use the more common
+       and typical `DESTDIR'.
 +2011-05-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: avoid spurious failures in cross-compile mode
 +      * tests/depcomp2.test: Ensure verbose printing of captured stderr
 +      from configure.
 +      * tests/ansi3.test ($required): Add 'native', as the ansi2knr
 +      functionality is not meant to work with a cross-compiler.
 +      * tests/ansi3b.test: Likewise.
 +      * tests/ansi5.test: Likewise.
 +      * tests/ansi6.test: Likewise.
 +      * tests/ansi7.test: Likewise.
 +      * tests/ansi8.test: Likewise.
 +      * tests/ansi10.test: Likewise.
 +      * tests/subobj3.test: Likewise.
 +      * tests/check8.test ($required): Add 'native', as this test is
 +      not meant to work with a cross-compiler.
 +      * tests/gnits2.test: Likewise.
 +      * tests/ltconv.test: Likewise.
 +      * tests/ltcond2.test: Likewise.
 +      * tests/parallel-tests5.test: Likewise.
 +      * tests/specflg7.test: Likewise.
 +      * tests/specflg8.test: Likewise.
 +      * tests/check5.test: Likewise.  Also, ensure verbose printing of
 +      captured make output, and thrown in few cosmetic and consistency
 +      improvements.
 +      * tests/ltinit.test: Be laxer in grepping configure output, to
 +      avoid spurious failures on systems which lack POSIX dynamic
 +      linking (e.g., MinGW), or when cross-compiling for such systems.
 +      * tests/ansi9.test: Skip parts of the test that would require a
 +      native compiler.
 +      * tests/backcompat6.test: Likewise.
 +      * tests/depcomp8a.test: Likewise.
 +      * tests/pr401.test: Likewise.
 +      * tests/pr401b.test: Likewise.
 +      * tests/pr401c.test: Likewise.
 +      * tests/target-cflags.test: Likewise.
 +      * tests/lex3.test: Likewise.
 +      * tests/yacc-basic.test: Likewise.
 +      * tests/autohdr4.test: Likewise.  Also, extend the test to ensure
 +      more coverage in cross-compile mode.
 +      * tests/canon7.test: Likewise.
 +      * tests/check9.test: Removed, split into two new tests ...
 +      * tests/check-subst-prog.test: ... this one, which requires a
 +      native C compiler ...
 +      * tests/check-subst.test: ... and this one, which doesn't require
 +      any compiler.
 +      * tests/parallel-tests4.test: Removed, split into two new tests ...
 +      * tests/parallel-tests-suffix-prog.test: ... this one, which
 +      requires a native C compiler ...
 +      * tests/parallel-tests-suffix.test: ... and this one, which
 +      doesn't require any compiler.
 +      * tests/parallel-tests7.test: Removed, split into two new tests ...
 +      * tests/parallel-tests-ext-driver-prog.test: ... this one, which
 +      requires a native C compiler ...
 +      * tests/parallel-tests-ext-driver.test: ... and this one, which
 +      doesn't require any compiler.
 +      * tests/Makefile.am (TESTS): Update.
 +
  2011-05-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        test defs: rename requirement 'non-cross' -> 'native'
index 74d207fdf60551b984e20829c438e6760613e0e4,5b90af698f48fe744c2be7b39548c6f6865d92e7..87dd626620cb031e9a345709e7a564fa562cf3a8
@@@ -303,71 -295,72 +303,70 @@@ parallel_tests = backcompat5-p.test che
        check-tests-in-builddir-p.test check-tests_environment-p.test \
        check-p.test check10-p.test check11-p.test check12-p.test \
        check2-p.test check3-p.test check4-p.test check5-p.test \
 -      check6-p.test check7-p.test check8-p.test check9-p.test \
 -      color-p.test color2-p.test comment9-p.test dejagnu-p.test \
 -      exeext4-p.test maken3-p.test maken4-p.test \
 -      posixsubst-tests-p.test
 -instspc_tests = instspc-squote-build.test instspc-squote-install.test \
 -      instspc-dquote-build.test instspc-dquote-install.test \
 -      instspc-bquote-build.test instspc-bquote-install.test \
 -      instspc-sharp-build.test instspc-sharp-install.test \
 -      instspc-dollar-build.test instspc-dollar-install.test \
 -      instspc-bang-build.test instspc-bang-install.test \
 -      instspc-bslash-build.test instspc-bslash-install.test \
 -      instspc-ampersand-build.test instspc-ampersand-install.test \
 -      instspc-percent-build.test instspc-percent-install.test \
 -      instspc-leftpar-build.test instspc-leftpar-install.test \
 -      instspc-rightpar-build.test instspc-rightpar-install.test \
 -      instspc-pipe-build.test instspc-pipe-install.test \
 -      instspc-caret-build.test instspc-caret-install.test \
 -      instspc-tilde-build.test instspc-tilde-install.test \
 -      instspc-qmark-build.test instspc-qmark-install.test \
 -      instspc-star-build.test instspc-star-install.test \
 -      instspc-plus-build.test instspc-plus-install.test \
 -      instspc-minus-build.test instspc-minus-install.test \
 -      instspc-comma-build.test instspc-comma-install.test \
 -      instspc-colon-build.test instspc-colon-install.test \
 -      instspc-semicol-build.test instspc-semicol-install.test \
 -      instspc-equal-build.test instspc-equal-install.test \
 -      instspc-less-build.test instspc-less-install.test \
 -      instspc-more-build.test instspc-more-install.test \
 -      instspc-at-build.test instspc-at-install.test \
 -      instspc-lqbrack-build.test instspc-lqbrack-install.test \
 -      instspc-rqbrack-build.test instspc-rqbrack-install.test \
 -      instspc-lcbrack-build.test instspc-lcbrack-install.test \
 -      instspc-rcbrack-build.test instspc-rcbrack-install.test \
 -      instspc-space-build.test instspc-space-install.test \
 -      instspc-tab-build.test instspc-tab-install.test \
 -      instspc-linefeed-build.test instspc-linefeed-install.test \
 -      instspc-backspace-build.test instspc-backspace-install.test \
 -      instspc-formfeed-build.test instspc-formfeed-install.test \
 -      instspc-carriageret-build.test \
 -      instspc-carriageret-install.test \
 -      instspc-quadrigraph0-build.test \
 -      instspc-quadrigraph0-install.test \
 -      instspc-quadrigraph1-build.test \
 -      instspc-quadrigraph1-install.test \
 -      instspc-quadrigraph2-build.test \
 -      instspc-quadrigraph2-install.test \
 -      instspc-quadrigraph3-build.test \
 -      instspc-quadrigraph3-install.test \
 -      instspc-quadrigraph4-build.test \
 -      instspc-quadrigraph4-install.test instspc-a_b-build.test \
 -      instspc-a_b-install.test instspc-a__b-build.test \
 -      instspc-a__b-install.test instspc-a_lf_b-build.test \
 -      instspc-a_lf_b-install.test instspc-dotdotdot-build.test \
 -      instspc-dotdotdot-install.test instspc-dosdrive-build.test \
 -      instspc-dosdrive-install.test instspc-miscglob1-build.test \
 -      instspc-miscglob1-install.test instspc-miscglob2-build.test \
 -      instspc-miscglob2-install.test
 -instspc_xfail_tests = instspc-squote-build.test \
 -      instspc-dquote-build.test instspc-bquote-build.test \
 -      instspc-sharp-build.test instspc-dollar-build.test \
 -      instspc-bslash-build.test instspc-ampersand-build.test \
 -      instspc-linefeed-build.test instspc-quadrigraph0-build.test \
 -      instspc-a_lf_b-build.test instspc-squote-install.test \
 -      instspc-dquote-install.test instspc-bquote-install.test \
 -      instspc-sharp-install.test instspc-dollar-install.test \
 -      instspc-linefeed-install.test instspc-a_lf_b-install.test
 +      check6-p.test check7-p.test check8-p.test color-p.test \
 +      color2-p.test comment9-p.test dejagnu-p.test exeext4-p.test \
-       maken3-p.test maken4-p.test posixsubst-tests-p.test \
-       pr401-p.test pr401b-p.test pr401c-p.test
++      maken3-p.test maken4-p.test posixsubst-tests-p.test
 +instspc_tests = build-squote.instspc install-squote.instspc \
 +      build-dquote.instspc install-dquote.instspc \
 +      build-bquote.instspc install-bquote.instspc \
 +      build-sharp.instspc install-sharp.instspc build-dollar.instspc \
 +      install-dollar.instspc build-bang.instspc install-bang.instspc \
 +      build-bslash.instspc install-bslash.instspc \
 +      build-ampersand.instspc install-ampersand.instspc \
 +      build-percent.instspc install-percent.instspc \
 +      build-leftpar.instspc install-leftpar.instspc \
 +      build-rightpar.instspc install-rightpar.instspc \
 +      build-pipe.instspc install-pipe.instspc build-caret.instspc \
 +      install-caret.instspc build-tilde.instspc \
 +      install-tilde.instspc build-qmark.instspc \
 +      install-qmark.instspc build-star.instspc install-star.instspc \
 +      build-plus.instspc install-plus.instspc build-minus.instspc \
 +      install-minus.instspc build-comma.instspc \
 +      install-comma.instspc build-colon.instspc \
 +      install-colon.instspc build-semicol.instspc \
 +      install-semicol.instspc build-equal.instspc \
 +      install-equal.instspc build-less.instspc install-less.instspc \
 +      build-more.instspc install-more.instspc build-at.instspc \
 +      install-at.instspc build-lqbrack.instspc \
 +      install-lqbrack.instspc build-rqbrack.instspc \
 +      install-rqbrack.instspc build-lcbrack.instspc \
 +      install-lcbrack.instspc build-rcbrack.instspc \
 +      install-rcbrack.instspc build-space.instspc \
 +      install-space.instspc build-tab.instspc install-tab.instspc \
 +      build-linefeed.instspc install-linefeed.instspc \
 +      build-backspace.instspc install-backspace.instspc \
 +      build-formfeed.instspc install-formfeed.instspc \
 +      build-carriageret.instspc install-carriageret.instspc \
 +      build-quadrigraph0.instspc install-quadrigraph0.instspc \
 +      build-quadrigraph1.instspc install-quadrigraph1.instspc \
 +      build-quadrigraph2.instspc install-quadrigraph2.instspc \
 +      build-quadrigraph3.instspc install-quadrigraph3.instspc \
 +      build-quadrigraph4.instspc install-quadrigraph4.instspc \
 +      build-a_b.instspc install-a_b.instspc build-a__b.instspc \
 +      install-a__b.instspc build-a_lf_b.instspc \
 +      install-a_lf_b.instspc build-dotdotdot.instspc \
 +      install-dotdotdot.instspc build-dosdrive.instspc \
 +      install-dosdrive.instspc build-miscglob1.instspc \
 +      install-miscglob1.instspc build-miscglob2.instspc \
 +      install-miscglob2.instspc
 +instspc_xfail_tests = build-squote.instspc build-dquote.instspc \
 +      build-bquote.instspc build-sharp.instspc build-dollar.instspc \
 +      build-bslash.instspc build-ampersand.instspc \
 +      build-linefeed.instspc build-quadrigraph0.instspc \
 +      build-a_lf_b.instspc install-squote.instspc \
 +      install-dquote.instspc install-bquote.instspc \
 +      install-sharp.instspc install-dollar.instspc \
 +      install-linefeed.instspc install-a_lf_b.instspc
 +INSTSPC_LOG_COMPILER = $(SHELL) $(srcdir)/instspc-tests.sh
 +depmod_tests = depcomp-gcc3.depmod depcomp-gcc.depmod \
 +      depcomp-hp.depmod depcomp-sgi.depmod depcomp-aix.depmod \
 +      depcomp-icc.depmod depcomp-hp2.depmod depcomp-tru64.depmod \
 +      depcomp-msvc7.depmod depcomp-msvc7msys.depmod \
 +      depcomp-nosideeffect.depmod depcomp-dashmstdout.depmod \
 +      depcomp-dashXmstdout.depmod depcomp-makedepend.depmod \
 +      depcomp-cpp.depmod depcomp-msvisualcpp.depmod \
 +      depcomp-msvcmsys.depmod
 +DEPMOD_LOG_COMPILER = $(SHELL) $(srcdir)/depmod-tests.sh
  
  # Some testsuite-influential variables should be overridable from the
  # test scripts, but not from the environment.
Simple merge
index acc21dc556e562b8882567889a49895117d6f043,35511a23a35c5d1d1a1eeca38f77feb1c1111ac7..e150190b1c2bc772c6bc54fe45208e18653aeca9
@@@ -18,6 -18,8 +18,7 @@@
  # Check support for AC_CONFIG_LIBOBJ_DIR vs LIBOBJS.
  # (pr401b.test and pr401c.test do the same for LTLIBOBJS and ALLOCA)
  
 -required=gcc
+ parallel_tests=no
  . ./defs || Exit 1
  
  mkdir lib src
index 68d9750bb4f528bed3340cfea82891fd2382782b,3997bc4b02aa263c2fe15c625ade949aa5c7f360..58b3d8a167028cfda06ffb199b1f3fa2b4438565
@@@ -18,7 -18,8 +18,8 @@@
  # Check support for AC_CONFIG_LIBOBJ_DIR vs LTLIBOBJS.
  # (pr401.test and pr401c.test do the same for LIBOBJS and ALLOCA)
  
 -required='gcc libtoolize'
+ parallel_tests=no
 +required=libtoolize
  . ./defs || Exit 1
  
  mkdir lib src
index 7e42aae2e08306815f03bbd71519b850deb23606,960de838371333b301601f37650180b53d9da274..91156cd4e0ea8cf21523f9a33ba4a664a6fc3854
@@@ -18,6 -18,8 +18,7 @@@
  # Check support for AC_CONFIG_LIBOBJ_DIR vs ALLOCA.
  # (pr401.test and pr401b.test do the same for LIBOBJS and LTLIBOBJS)
  
 -required=gcc
+ parallel_tests=no
  . ./defs || Exit 1
  
  mkdir lib src