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.

diff --git a/ChangeLog b/ChangeLog
index a48d4d2aa43f63fab2afffbcbf0de579a10c38da..460c21314f04bae61338d0c7e8c04fa5156f5fab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-08-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       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  <stefano.lattarini@gmail.com>
 
        tests: avoid re-running a test with the 'parallel-tests' option

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8e73e5ce0e7d6ffe79eb42b46c99194392537808..0414e4f04532b896bbf71d353061c5f523e67064 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -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 aec6d776f1b34496022b6b2845c2fa2b2c26d0a3..cec28b91bf1b466caa41e1a4c7d2ed42a4ea0602 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -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;

diff --git a/tests/defs-static.in b/tests/defs-static.in
index f1294c638fafc3f80cdb90f8e7de534c2e1ad264..de9bd6696f9d16c1b4aecf71fca0610294d25f11 100644 (file)
--- 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 1f7dba2b38530de922887b811d0193415cd95cb2..1dac0203154d02f80c025e66cd3ecd0a0cc3aad7 100755 (executable)
--- 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
 '