testsuite: drop redundant environment sanitization

* tests/Makefile.am (TESTS_ENVIRONMENT): Don't remove `planned'
from the environment.
* tests/defs-static.in: Don't complain if `planned' is set in
the environment.
* tests/self-check-env-sanitize.test: Update.

diff --git a/ChangeLog b/ChangeLog
index 6def035..ca3af67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+       testsuite: drop redundant environment sanitization
+       * tests/Makefile.am (TESTS_ENVIRONMENT): Don't remove `planned'
+       from the environment.
+       * tests/defs-static.in: Don't complain if `planned' is set in
+       the environment.
+       * tests/self-check-env-sanitize.test: Update.
+
+2011-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
        test defs: fix bug in plain version of `skip_all_'
        * tests/plain-functions.sh (skip_all_): Call `skip_', not `skip'.
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index eb3fd51..c887155 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -89,7 +89,6 @@ $(config_shell_tests):
 AM_TESTS_ENVIRONMENT = \
   test x"$$me" = x || unset me; \
   test x"$$required" = x || unset required; \
-  test x"$$planned" = x || unset planned; \
   test x"$$use_tap" = x || unset use_tap; \
   test x"$$parallel_tests" = x || unset parallel_tests; \
   test x"$$test_prefer_config_shell" || unset test_prefer_config_shell; \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7dd6394..3520590 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -342,10 +342,9 @@ 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"$$planned" = x || \
-       unset planned; test x"$$use_tap" = x || unset use_tap; test \
-       x"$$parallel_tests" = x || unset parallel_tests; test \
-       x"$$test_prefer_config_shell" || unset \
+       x"$$required" = x || unset required; test x"$$use_tap" = x || \
+       unset use_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 || \
        unset original_ACLOCAL; AM_TESTS_REEXEC=no; export \

diff --git a/tests/defs-static.in b/tests/defs-static.in
index 73eaad1..62f7486 100644 (file)
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -73,7 +73,6 @@ fi
 for var in \
   me \
   required \
-  planned \
   use_tap \
   parallel_tests \
   test_prefer_config_shell \

diff --git a/tests/self-check-env-sanitize.test b/tests/self-check-env-sanitize.test
index 84c6b9f..e2d8f2a 100755 (executable)
--- a/tests/self-check-env-sanitize.test
+++ b/tests/self-check-env-sanitize.test
@@ -27,7 +27,6 @@ vars='
   me
   parallel_tests
   required
-  planned
   use_tap
   test_prefer_config_shell
   original_AUTOMAKE