[Automake-commit] [SCM] GNU Automake branch, test-protocols, updated. v1.11-1071-g5957249

[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=5957249003ff8a68044602cf10aaaf31480edb99

The branch, test-protocols has been updated
       via  5957249003ff8a68044602cf10aaaf31480edb99 (commit)
       via  4bcb63dc17a395e34f7e89d6764e7945c9d14549 (commit)
       via  7dab3a457990b054cb738fe2bb5b2fa12d0b3912 (commit)
      from  027e98e68e9f75ea17cb3510491bdfac11e4f806 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                          |   29 +++++++++++++++++++++++++++++
 tests/Makefile.am                  |    4 ++--
 tests/Makefile.in                  |    7 +++----
 tests/backcompat5.test             |    3 ++-
 tests/defs-static.in               |    2 +-
 tests/self-check-env-sanitize.test |    2 +-
 6 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e837a2..9ff3427 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,34 @@
 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".
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8e73e5c..d12c653 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,7 @@
 
 TEST_EXTENSIONS = .test .tap
 TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
-TAP_LOG_DRIVER_FLAGS = --merge
+AM_TAP_LOG_DRIVER_FLAGS = --merge
 
 MAINTAINERCLEANFILES =
 EXTRA_DIST = ChangeLog-old
@@ -107,7 +107,7 @@ XFAIL_TESTS += $(instspc_xfail_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"$$original_AUTOMAKE" = x || unset original_AUTOMAKE; \
   test x"$$original_ACLOCAL" = x || unset original_ACLOCAL;
diff --git a/tests/Makefile.in b/tests/Makefile.in
index feb3d50..faad2ae 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -280,7 +280,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 TEST_EXTENSIONS = .test .tap
 TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
-TAP_LOG_DRIVER_FLAGS = --merge
+AM_TAP_LOG_DRIVER_FLAGS = --merge
 MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests)
 EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \
        $(TESTS) tap-functions.sh plain-functions.sh \
@@ -290,7 +290,7 @@ XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \
        override-conditional-2.test pr8365-remake-timing.test \
        yacc-dist-nobuild-subdir.test txinfo5.test \
        $(instspc_xfail_tests)
-parallel_tests = backcompat5-p.test check-concurrency-bug9245-p.test \
+parallel_tests = check-concurrency-bug9245-p.test \
        check-exported-srcdir-p.test check-fd-redirect-p.test \
        check-tests-in-builddir-p.test check-p.test check11-p.test \
        check12-p.test check2-p.test check3-p.test check4-p.test \
@@ -366,7 +366,7 @@ instspc_xfail_tests = instspc-squote-build.test \
 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"$$original_AUTOMAKE" = x || unset original_AUTOMAKE; \
   test x"$$original_ACLOCAL" = x || unset original_ACLOCAL;
@@ -1865,7 +1865,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 2385ae4..45cb43a 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-static.in b/tests/defs-static.in
index f1294c6..de9bd66 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -66,7 +66,7 @@ fi
 # Check that the environment is properly sanitized.
 # Having variables exported to the empty string is OK, since our code
 # treats such variables as if they were unset.
-for var in me required use_tap parallel_tests \
+for var in me required using_tap parallel_tests \
            original_AUTOMAKE original_ACLOCAL;
 do
   if eval "test x\"\$$var\" != x" && env | grep "^$var=" >/dev/null; then
diff --git a/tests/self-check-env-sanitize.test 
b/tests/self-check-env-sanitize.test
index 1f7dba2..1dac020 100755
--- a/tests/self-check-env-sanitize.test
+++ b/tests/self-check-env-sanitize.test
@@ -27,7 +27,7 @@ vars='
   me
   parallel_tests
   required
-  use_tap
+  using_tap
   original_AUTOMAKE
   original_ACLOCAL
 '


hooks/post-receive
-- 
GNU Automake