* tests/defs.in: Also unset variables AM_COLOR_TESTS and
AM_TESTS_ENVIRONMENT.
---
 ChangeLog     |    6 ++++++
 tests/defs.in |    3 ++-
 2 files changed, 8 insertions(+), 1 deletions(-)

I've applied the attached patch to maint, merged to all relevant
branches, and updated.

Once merged into test-protocols, this change fixes spurious failures
of usages like:

  $ AM_COLOR_TESTS=always make check TESTS='color.test'

Regards,
  Stefano
From c7c62a4a2f075d7fcb4c035de361491008778fc5 Mon Sep 17 00:00:00 2001
Message-Id: <c7c62a4a2f075d7fcb4c035de361491008778fc5.1312807450.git.stefano.lattar...@gmail.com>
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Mon, 8 Aug 2011 14:39:16 +0200
Subject: [PATCH] test defs: more environment cleanup

* tests/defs.in: Also unset variables AM_COLOR_TESTS and
AM_TESTS_ENVIRONMENT.
---
 ChangeLog     |    6 ++++++
 tests/defs.in |    3 ++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dd6e139..af2556f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-08-08  Stefano Lattarini  <stefano.lattar...@gmail.com>
 
+	test defs: more environment cleanup
+	* tests/defs.in: Also unset variables AM_COLOR_TESTS and
+	AM_TESTS_ENVIRONMENT.
+
+2011-08-08  Stefano Lattarini  <stefano.lattar...@gmail.com>
+
 	tests: fix spurious failure with Solaris make
 	* tests/distcheck-configure-flags-am.test: Avoid using `+=' too
 	liberally with AM_DISTCHECK_CONFIGURE_FLAGS, since the line breaks
diff --git a/tests/defs.in b/tests/defs.in
index f5e9e29..7759455 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -432,8 +432,9 @@ unset DISTCHECK_CONFIGURE_FLAGS AM_DISTCHECK_CONFIGURE_FLAGS
 # 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
-- 
1.7.2.3

Reply via email to