I've applied the attached patch to fix a spurious testsuite failure in master, caused by (yet another) botched merge of mine.
Again, sorry for the noise, Stefano
From 6af0d20f95e905eef190abf8ea442bbe018171c2 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini <[email protected]> Date: Sun, 24 Apr 2011 18:08:44 +0200 Subject: [PATCH] tests: fix spurious failure (non-renamed AM_TESTS_SETUP usage) * tests/parallel-tests-reset-term.test: Use AM_TESTS_ENVIRONMENT instead of AM_TESTS_SETUP (which has been removed in commit v1.11-349-g12f48fa). Fix spurious failure introduced by merge `v1.11-781-gfeed175'. --- ChangeLog | 8 ++++++++ tests/parallel-tests-reset-term.test | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a84daca..a36efe5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-04-24 Stefano Lattarini <[email protected]> + + tests: fix spurious failure (non-renamed AM_TESTS_SETUP usage) + * tests/parallel-tests-reset-term.test: Use AM_TESTS_ENVIRONMENT + instead of AM_TESTS_SETUP (which has been removed in commit + v1.11-349-g12f48fa). + Fix spurious failure introduced by merge `v1.11-781-gfeed175'. + 2011-04-18 Stefano Lattarini <[email protected]> check: rename AM_TESTS_SETUP -> AM_TESTS_ENVIRONMENT diff --git a/tests/parallel-tests-reset-term.test b/tests/parallel-tests-reset-term.test index c98a6b5..3a222c0 100755 --- a/tests/parallel-tests-reset-term.test +++ b/tests/parallel-tests-reset-term.test @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Check that the parallel-tests driver correctly handle overrides of -# the TERM variable by either TESTS_ENVIRONMENT and AM_TESTS_SETUP. +# Check that the parallel-tests driver correctly handle overrides of the +# TERM variable by either TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT. parallel_tests=yes . ./defs || Exit 1 @@ -78,12 +78,12 @@ cat stdout | $FGREP "$esc" && Exit 1 TERM=ansi; export TERM expected_term=dumb; export expected_term -mkcheck AM_TESTS_SETUP='TERM=dumb' +mkcheck AM_TESTS_ENVIRONMENT='TERM=dumb' cat stdout | grep "PASS.*foobar" | $FGREP "$esc" TERM=dumb; export TERM expected_term=ansi; export expected_term -mkcheck AM_TESTS_SETUP='TERM=ansi' +mkcheck AM_TESTS_ENVIRONMENT='TERM=ansi' cat stdout | $FGREP "$esc" && Exit 1 : -- 1.7.2.3
