summaryrefslogtreecommitdiff
path: root/tests/defs
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-08-08 14:42:42 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2011-08-08 14:42:50 +0200
commit2cf22db73f5374bd0f528abfaf65987eab12a665 (patch)
tree58f0c700a308ae54de3c035c59bff0dfa3af7708 /tests/defs
parent1e0238adb8510b959bed87c264581e98afea9a92 (diff)
parentf807dd5a843bc219424b3a9f33f2498dbc1c610a (diff)
downloadautomake-2cf22db73f5374bd0f528abfaf65987eab12a665.tar.gz
Merge branch 'master' into test-protocols
* master: test defs: more environment cleanup
Diffstat (limited to 'tests/defs')
-rw-r--r--tests/defs3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/defs b/tests/defs
index 3aadda307..b682c5e77 100644
--- a/tests/defs
+++ b/tests/defs
@@ -92,8 +92,9 @@ unset srcdir
# conceptually independent, they cause some changed semantics we
# need to control (and test for) in some of the tests to ensure
# backward-compatible behavior.
-unset TESTS_ENVIRONMENT
+unset TESTS_ENVIRONMENT AM_TESTS_ENVIRONMENT
unset DISABLE_HARD_ERRORS
+unset AM_COLOR_TESTS
unset TESTS
unset TEST_LOG_COMPILER
unset TEST_LOGS