[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1259-ga8650c3

[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=a8650c3ed060f496acef2d6dd13b8c67e93dd104

The branch, testsuite-work has been updated
       via  a8650c3ed060f496acef2d6dd13b8c67e93dd104 (commit)
       via  5957249003ff8a68044602cf10aaaf31480edb99 (commit)
       via  4bcb63dc17a395e34f7e89d6764e7945c9d14549 (commit)
       via  7dab3a457990b054cb738fe2bb5b2fa12d0b3912 (commit)
       via  027e98e68e9f75ea17cb3510491bdfac11e4f806 (commit)
      from  9d1fac14e32e056dea67d2beb69f693f5633c16a (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 a8650c3ed060f496acef2d6dd13b8c67e93dd104
Merge: 9d1fac1 5957249
Author: Stefano Lattarini <address@hidden>
Date:   Mon Aug 29 15:48:04 2011 +0200

    Merge branch 'test-protocols' into testsuite-work
    
    * test-protocols:
      tests: prefer AM_... variables to user-reserved ones in Makefile
      tests: some minor fixlets w.r.t. TAP-based tests
      tests: avoid re-running a test with the 'parallel-tests' option
      tests: defaults to awk+shell driver in tests on TAP support
    
    With minor manual edits to 'tests/Makefile.am' to complete the
    TAP_LOG_DRIVER_FLAGS -> AM_TAP_LOG_DRIVER_FLAGS rename.

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

Summary of changes:
 ChangeLog                         |   35 +++++++++++++++++++++++++++++++++++
 tests/Makefile.am                 |    7 ++++---
 tests/Makefile.in                 |   11 +++++------
 tests/backcompat5.test            |    3 ++-
 tests/defs                        |    2 +-
 tests/defs-static.in              |    2 +-
 tests/self-check-env-sanitize.tap |    2 +-
 7 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 468388e..f6f4447 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: prefer AM_... variables to user-reserved ones in Makefile
+       * tests/Makefile.am (TAP_LOG_DRIVER_FLAGS): Renamed ...
+       (AM_TAP_LOG_DRIVER_FLAGS): ... to this.
+
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: some minor fixlets w.r.t. TAP-based tests
+       The variable that is used by our test scripts to decide whether
+       they are "plain" or TAP-based is `using_tap'; however, some
+       peripheral sanity checks and sanitization code in our testsuite
+       were erroneously using the `use_tap' variable instead.  Fix that.
+       * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Nullify `using_tap',
+       not `use_tap'.
+       * tests/defs-static.in: Check that `using_tap', not `use_tap',
+       is not exported.
+       * tests/self-check-env-sanitize.test: Update.
+
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: avoid re-running a test with the 'parallel-tests' option
+       * tests/backcompat5.test (parallel_tests): Define to "no", to
+       prevent the generation of a sibling test script that uses the
+       'parallel-tests' driver.  That would be useless anyway, since
+       we manually override the contents of configure.in, thus clobbering
+       the `parallel-tests' option in AM_INIT_AUTOMAKE.
+       Fix a typo in comments since we are at it.
+
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: defaults to awk+shell driver in tests on TAP support
+       * tests/defs ($am_tap_implementation): Default to "shell", not
+       to "perl".
+
 2011-08-25  Stefano Lattarini  <address@hidden>
 
        tests: list "forgotten" test script in TESTS
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 900ac6b..ce37884 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,7 +24,8 @@ TEST_LOG_COMPILER = $(LOG_COMPILER)
 TAP_LOG_COMPILER = $(LOG_COMPILER)
 
 TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
-TAP_LOG_DRIVER_FLAGS = --merge --comments
+
+AM_TAP_LOG_DRIVER_FLAGS = --merge --comments
 ## Avoid spurious TAP diagnostic.  We use an awful indirection with a
 ## shell command substitution here, since the string needs to contain
 ## `#' characters, and these can't be escaped portably in a make macro
@@ -33,7 +34,7 @@ TAP_LOG_DRIVER_FLAGS = --merge --comments
 ## FIXME: per TAP test script; this is OK for the moment, since we have
 ## FIXME: few such scripts, but might become an issue in the future.
 ## Keep this in sync with the definition of $diag_string_ in tests/defs.
-TAP_LOG_DRIVER_FLAGS += --diagnostic-string `printf '\043%%\043\n'`
+AM_TAP_LOG_DRIVER_FLAGS += --diagnostic-string `printf '\043%%\043\n'`
 
 MAINTAINERCLEANFILES =
 EXTRA_DIST = ChangeLog-old
@@ -87,7 +88,7 @@ $(config_shell_tests):
 AM_TESTS_ENVIRONMENT = \
   test x"$$me" = x || unset me; \
   test x"$$required" = x || unset required; \
-  test x"$$use_tap" = x || unset use_tap; \
+  test x"$$using_tap" = x || unset using_tap; \
   test x"$$parallel_tests" = x || unset parallel_tests; \
   test x"$$test_prefer_config_shell" || unset test_prefer_config_shell; \
   test x"$$original_AUTOMAKE" = x || unset original_AUTOMAKE; \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c948db4..42c6b23 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -299,8 +299,8 @@ TEST_EXTENSIONS = .test .tap .ptest .shtst
 TEST_LOG_COMPILER = $(LOG_COMPILER)
 TAP_LOG_COMPILER = $(LOG_COMPILER)
 TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
-TAP_LOG_DRIVER_FLAGS = --merge --comments --diagnostic-string `printf \
-       '\043%%\043\n'`
+AM_TAP_LOG_DRIVER_FLAGS = --merge --comments --diagnostic-string \
+       `printf '\043%%\043\n'`
 MAINTAINERCLEANFILES = 
 EXTRA_DIST = ChangeLog-old gen-parallel-tests parallel-tests.sh \
        gen-config-shell-tests config-shell-tests.sh \
@@ -316,7 +316,7 @@ pr8365-remake-timing.test \
 yacc-dist-nobuild-subdir.test \
 txinfo5.test
 
-parallel_tests = backcompat5-p.ptest check-concurrency-bug9245-p.ptest \
+parallel_tests = check-concurrency-bug9245-p.ptest \
        check-exported-srcdir-p.ptest check-fd-redirect-p.ptest \
        check-subst-prog-p.ptest check-subst-p.ptest \
        check-tests-in-builddir-p.ptest check-p.ptest check11-p.ptest \
@@ -340,8 +340,8 @@ SHTST_LOG_COMPILER = $(LOG_COMPILER) 
$(srcdir)/config-shell-tests.sh
 # we are already running them under it explicitly in our setup (see e.g.
 # the definition of TEST_LOG_COMPILER above).
 AM_TESTS_ENVIRONMENT = test x"$$me" = x || unset me; test \
-       x"$$required" = x || unset required; test x"$$use_tap" = x || \
-       unset use_tap; test x"$$parallel_tests" = x || unset \
+       x"$$required" = x || unset required; test x"$$using_tap" = x \
+       || unset using_tap; test x"$$parallel_tests" = x || unset \
        parallel_tests; test x"$$test_prefer_config_shell" || unset \
        test_prefer_config_shell; test x"$$original_AUTOMAKE" = x || \
        unset original_AUTOMAKE; test x"$$original_ACLOCAL" = x || \
@@ -1876,7 +1876,6 @@ uninstall-am:
        mostlyclean-generic pdf pdf-am ps ps-am recheck recheck-html \
        uninstall uninstall-am
 
-backcompat5-p.log: backcompat5.test
 check-concurrency-bug9245-p.log: check-concurrency-bug9245.test
 check-exported-srcdir-p.log: check-exported-srcdir.test
 check-fd-redirect-p.log: check-fd-redirect.test
diff --git a/tests/backcompat5.test b/tests/backcompat5.test
index 0630a50..bfa45b2 100755
--- a/tests/backcompat5.test
+++ b/tests/backcompat5.test
@@ -16,9 +16,10 @@
 
 # Backward-compatibility test: try to build and distribute a package
 # using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT.
-# This script can also serve as mild stress-testing for Automke.
+# This script can also serve as mild stress-testing for Automake.
 # See also the similar test `backcompat6.test'.
 
+parallel_tests=no
 . ./defs || Exit 1
 
 # Yuck!
diff --git a/tests/defs b/tests/defs
index e4e1840..671ce6f 100644
--- a/tests/defs
+++ b/tests/defs
@@ -510,7 +510,7 @@ fetch_tap_driver ()
 }
 # The shell/awk implementation of the TAP driver is still mostly dummy, so
 # use the perl implementation by default for the moment.
-am_tap_implementation=${am_tap_implementation-perl}
+am_tap_implementation=${am_tap_implementation-shell}
 
 ## ----------------------------------------------------------- ##
 ##  Checks for required tools, and additional setups (if any)  ##
diff --git a/tests/defs-static.in b/tests/defs-static.in
index 0a7b77a..0f62d32 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -73,7 +73,7 @@ fi
 for var in \
   me \
   required \
-  use_tap \
+  using_tap \
   parallel_tests \
   am_create_testdir \
   test_prefer_config_shell \
diff --git a/tests/self-check-env-sanitize.tap 
b/tests/self-check-env-sanitize.tap
index 4556e47..09a657c 100755
--- a/tests/self-check-env-sanitize.tap
+++ b/tests/self-check-env-sanitize.tap
@@ -30,7 +30,7 @@ vars='
   me
   parallel_tests
   required
-  use_tap
+  using_tap
   am_create_testdir
   test_prefer_config_shell
   original_AUTOMAKE


hooks/post-receive
-- 
GNU Automake