[Automake-commit] [SCM] GNU Automake branch, java-work, updated. v1.11-383-g30f8ffc

[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=30f8ffc019653ba9b0ab47deda155d0efe660c8f

The branch, java-work has been updated
       via  30f8ffc019653ba9b0ab47deda155d0efe660c8f (commit)
       via  82fc4d353ce941f09f16738a31fb8958d0320be2 (commit)
       via  3352b4e8e52d48fd98cda77750d21a819f5cfd47 (commit)
       via  0f53bd10322ac70691d8bed06533424eef8db0e6 (commit)
      from  bf1d029660136387a9fd4a451b230f954a81db5c (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 30f8ffc019653ba9b0ab47deda155d0efe660c8f
Merge: bf1d029 82fc4d3
Author: Stefano Lattarini <address@hidden>
Date:   Fri May 20 23:35:26 2011 +0200

    Merge branch 'maint' into java-work
    
    * maint:
      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
    
    With extra edits to these files:
      - tests/java-compile-run-flat.test
      - tests/java-compile-run-nested.test
      - ChangeLog
      - tests/Makefile.in (autogenerated)

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

Summary of changes:
 ChangeLog                          |   45 ++++++++++++++++++++++++++++++++++++
 tests/Makefile.in                  |    7 +----
 tests/README                       |   19 ++++++++------
 tests/gen-parallel-tests           |   11 +++++++-
 tests/java-compile-run-flat.test   |    7 ++++-
 tests/java-compile-run-nested.test |    9 ++++--
 tests/pr401.test                   |    1 +
 tests/pr401b.test                  |    1 +
 tests/pr401c.test                  |    1 +
 9 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 33c4c9e..b6702cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+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.
+       * tests/java-flat.test: Likewise, and properly update heading
+       comments.
+       * tests/java-nested.test: Likewise, but defining `parallel_tests'
+       to "yes" instead, for improved coverage in conjunction with the
+       sister test `java-flat.test'.
+
+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-19  Stefano Lattarini  <address@hidden>
 
        test defs: rename requirement 'non-cross' -> 'native'
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ffa42c7..25aab82 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -302,13 +302,8 @@ color2-p.test \
 comment9-p.test \
 dejagnu-p.test \
 exeext4-p.test \
-java-compile-run-flat-p.test \
-java-compile-run-nested-p.test \
 maken3-p.test \
-maken4-p.test \
-pr401-p.test \
-pr401b-p.test \
-pr401c-p.test
+maken4-p.test
 
 MAINTAINERCLEANFILES = $(parallel_tests)
 
diff --git a/tests/README b/tests/README
index 26ce3ff..9680a54 100644
--- a/tests/README
+++ b/tests/README
@@ -107,8 +107,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
@@ -177,12 +180,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 39f5d1e..451fb77 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
 
@@ -31,8 +39,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 |
 {
diff --git a/tests/java-compile-run-flat.test b/tests/java-compile-run-flat.test
index 76fde6c..0d5651e 100755
--- a/tests/java-compile-run-flat.test
+++ b/tests/java-compile-run-flat.test
@@ -18,10 +18,13 @@
 # Also meddle with wrapper scripts, as would be probably seen in a real
 # "UNIX-style" use case.
 # This test uses a "flat" setup for the source tree (i.e., everything in
-# the top-level directory); the sister test `java-compile-run-nested.test'
-# do similar checks with a more usual, "nested" setup.
+# the top-level directory), and forces the use of the old, non-parallel
+# testsuite driver.  The sister test `java-compile-run-nested.test' do
+# similar checks with a more usual, "nested" setup, and using the newer
+# 'parallel-tests' driver.
 
 required='java javac'
+parallel_tests=no
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/java-compile-run-nested.test 
b/tests/java-compile-run-nested.test
index 1a9abfd..ec75c92 100755
--- a/tests/java-compile-run-nested.test
+++ b/tests/java-compile-run-nested.test
@@ -18,11 +18,14 @@
 # Also meddle with wrapper scripts, as would be probably seen in a real
 # "UNIX-style" use case.
 # This test uses a typical "nested" source tree setup (i.e., different
-# componenets/aspects are separeted into different subdirectories); the
-# sister test `java-compile-run-flat.test' do similar checks with a
-# "flat" setup (i.e., everything in the top-level directory).
+# components/aspects are separated into different subdirectories),
+# and uses the 'parallel-tests' testsuite driver.  The sister test
+# `java-compile-run-flat.test' do similar checks with a "flat" setup
+# (i.e., everything in the top-level directory), and forcing the use
+# of the older non-parallel 'simple-tests' driver.
 
 required='java javac'
+parallel_tests=yes
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/pr401.test b/tests/pr401.test
index b68b5ed..88f7733 100755
--- a/tests/pr401.test
+++ b/tests/pr401.test
@@ -17,6 +17,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
 required=gcc
 . ./defs || Exit 1
 
diff --git a/tests/pr401b.test b/tests/pr401b.test
index 8e296ef..0af4646 100755
--- a/tests/pr401b.test
+++ b/tests/pr401b.test
@@ -17,6 +17,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='gcc libtoolize'
 . ./defs || Exit 1
 
diff --git a/tests/pr401c.test b/tests/pr401c.test
index 8682dc0..b94bc16 100755
--- a/tests/pr401c.test
+++ b/tests/pr401c.test
@@ -17,6 +17,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
 required=gcc
 . ./defs || Exit 1
 


hooks/post-receive
-- 
GNU Automake