[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-861-g6ca5ab0

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=6ca5ab0d009ca3edca0c6852e53ccd22c2e900c0

The branch, testsuite-work has been updated
       via  6ca5ab0d009ca3edca0c6852e53ccd22c2e900c0 (commit)
       via  0f0c60a48899d1328f7094ed135d2a83bc07e27a (commit)
       via  82fc4d353ce941f09f16738a31fb8958d0320be2 (commit)
       via  3352b4e8e52d48fd98cda77750d21a819f5cfd47 (commit)
       via  0f53bd10322ac70691d8bed06533424eef8db0e6 (commit)
      from  dd424bd7a35c3335a7d96c6f38da5fa1114d73a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6ca5ab0d009ca3edca0c6852e53ccd22c2e900c0
Merge: dd424bd 0f0c60a
Author: Stefano Lattarini <address@hidden>
Date:   Sat May 21 00:08:02 2011 +0200

    Merge branch 'master' into testsuite-work
    
    * 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

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                |   40 ++++++++++++++++++++++++++++++++++++++++
 tests/Makefile.in        |    6 +-----
 tests/README             |   19 +++++++++++--------
 tests/gen-parallel-tests |   11 +++++++++--
 tests/pr401.test         |    1 +
 tests/pr401b.test        |    1 +
 tests/pr401c.test        |    1 +
 7 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf26007..3f93d41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+2011-05-20  Stefano Lattarini  <address@hidden>
+
+       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  <address@hidden>
+
+       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  <address@hidden>
+
+       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  <address@hidden>
 
        tests: avoid spurious failures in cross-compile mode
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 74d207f..87dd626 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -305,8 +305,7 @@ parallel_tests = backcompat5-p.test 
check-exported-srcdir-p.test \
        check2-p.test check3-p.test check4-p.test check5-p.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 \
@@ -1690,9 +1689,6 @@ exeext4-p.log: exeext4.test
 maken3-p.log: maken3.test
 maken4-p.log: maken4.test
 posixsubst-tests-p.log: posixsubst-tests.test
-pr401-p.log: pr401.test
-pr401b-p.log: pr401b.test
-pr401c-p.log: pr401c.test
 
 $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
        $(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
diff --git a/tests/README b/tests/README
index bc34743..29c964b 100644
--- a/tests/README
+++ b/tests/README
@@ -127,8 +127,11 @@ Do
 
   For tests that use the `parallel-tests' Automake option, set the shell
   variable `parallel_tests' to "yes" before including ./defs.  Also,
-  use for them a name that ends in `-p.test' and does not clash with any
-  generated tests in the suite.
+  do not use for them a name that ends in `-p.test', since that would
+  risk to clash with automatically-generated tests.  For tests that are
+  *not* meant to work with the `parallel-tests' Automake option (these
+  should be very very few), set the shell variable `parallel_tests' to
+  "no" before including ./defs.
 
   ./defs sets a skeleton configure.in.  If possible, append to this
   file.  In some cases you'll have to overwrite it, but this should
@@ -200,12 +203,12 @@ Do not
   reason, but at least it makes sure the original error is still
   here.)
 
-  Do not override Makefile variables using make arguments, as in
-    $MAKE ANSI2KNR=./ansi2knr U=_ all
-  this is not portable for recursive targets (targets that
-  call a sub-make may not pass `ANSI2KNR=./ansi2knr U=_' along).
-  Use the following instead.
-    ANSI2KNR=./ansi2knr U=_ $MAKE -e all
+  Do not override Makefile variables using make arguments, as in e.g.:
+    $MAKE DESTDIR=/foo/bar install
+  This is not portable for recursive targets (targets that call a
+  sub-make may not pass `DESTDIR=/foo/bar' along).  Use the following
+  instead:
+    DESTDIR=/foo/bar $MAKE -e install
 
   Do not send a test case without signing a copyright disclaimer.
   See http://sources.redhat.com/automake/contribute.html or
diff --git a/tests/gen-parallel-tests b/tests/gen-parallel-tests
index 20b9ee1..0c96228 100755
--- a/tests/gen-parallel-tests
+++ b/tests/gen-parallel-tests
@@ -19,6 +19,14 @@
 # For each test in the TESTS list in this Makefile.am file, that itself
 # tests features of the TESTS automake interface, generate a sibling
 # test that does likewise, but with the option `parallel-tests' enabled.
+# Individual tests can prevent the creation of such a sibling by
+# explicitly setting the `$parallel_tests' variable to either "yes" or
+# "no".  The rationale for this is that if the variable is set to "yes",
+# the test already uses the `parallel-tests' option, so that a sibling
+# would be just a duplicate; while if the variable is set to "no", the
+# test doesn't support, or is not meant to run with, the `parallel-tests'
+# option, and forcing it to do so in the sibling would likely cause a
+# spurious failure.
 
 set -e
 
@@ -37,8 +45,7 @@ grep -v '.-p\.test' |
 LC_ALL=C sort -u |
 while read tst; do
   if grep '^[^#]*parallel-tests' $tst >/dev/null \
-     || grep "parallel_tests=yes" $tst >/dev/null \
-     || grep "parallel_tests=['\"]yes" $tst >/dev/null
+     || grep "parallel_tests=" $tst >/dev/null
   then :; else echo $tst; fi;
 done |
 sed -e 's/\.test$//' |
diff --git a/tests/pr401.test b/tests/pr401.test
index acc21dc..e150190 100755
--- a/tests/pr401.test
+++ b/tests/pr401.test
@@ -18,6 +18,7 @@
 # Check support for AC_CONFIG_LIBOBJ_DIR vs LIBOBJS.
 # (pr401b.test and pr401c.test do the same for LTLIBOBJS and ALLOCA)
 
+parallel_tests=no
 . ./defs || Exit 1
 
 mkdir lib src
diff --git a/tests/pr401b.test b/tests/pr401b.test
index 68d9750..58b3d8a 100755
--- a/tests/pr401b.test
+++ b/tests/pr401b.test
@@ -18,6 +18,7 @@
 # Check support for AC_CONFIG_LIBOBJ_DIR vs LTLIBOBJS.
 # (pr401.test and pr401c.test do the same for LIBOBJS and ALLOCA)
 
+parallel_tests=no
 required=libtoolize
 . ./defs || Exit 1
 
diff --git a/tests/pr401c.test b/tests/pr401c.test
index 7e42aae..91156cd 100755
--- a/tests/pr401c.test
+++ b/tests/pr401c.test
@@ -18,6 +18,7 @@
 # Check support for AC_CONFIG_LIBOBJ_DIR vs ALLOCA.
 # (pr401.test and pr401b.test do the same for LIBOBJS and LTLIBOBJS)
 
+parallel_tests=no
 . ./defs || Exit 1
 
 mkdir lib src


hooks/post-receive
-- 
GNU Automake