test defs: more environment cleanup

* tests/defs: Also unset the XFAIL_TESTS, and various
LOG_DRIVER, LOG_COMPILER variables (and corresponding
flags variable).

diff --git a/ChangeLog b/ChangeLog
index da911d5ae62074d7d5300d0f1b3b49db583f3895..39aa991debc6148e313fffa84d9c9d75c7463a97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       test defs: more environment cleanup
+       * tests/defs: Also unset the XFAIL_TESTS, and various
+       LOG_DRIVER, LOG_COMPILER variables (and corresponding
+       flags variable).
+
 2011-09-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        tests: allow depmod.tap to only run a subset of its tests

diff --git a/tests/defs b/tests/defs
index ac30e43ccd25dcf1ef3bef86ce6a48204263eb2e..d50cb393a1593c6cd2e2e13ffcb24d88138d50eb 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -161,11 +161,21 @@ unset TESTS_ENVIRONMENT AM_TESTS_ENVIRONMENT
 unset DISABLE_HARD_ERRORS
 unset AM_COLOR_TESTS
 unset TESTS
-unset TEST_LOG_COMPILER
+unset XFAIL_TESTS
 unset TEST_LOGS
 unset TEST_SUITE_LOG
 unset RECHECK_LOGS
 unset VERBOSE
+for pfx in TEST_ TAP_ ''; do
+  unset ${pfx}LOG_COMPILER
+  unset ${pfx}LOG_COMPILE # Not a typo!
+  unset ${pfx}LOG_FLAGS
+  unset AM_${pfx}LOG_FLAGS
+  unset ${pfx}LOG_DRIVER
+  unset ${pfx}LOG_DRIVER_FLAGS
+  unset AM_${pfx}LOG_DRIVER_FLAGS
+done
+unset pfx
 
 # Re-enable, it had been temporarily disabled above.
 set -e