[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-801-g15a3459

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=15a345934695382ae1dccf6f5c70aaceaecd44de

The branch, master has been updated
       via  15a345934695382ae1dccf6f5c70aaceaecd44de (commit)
       via  6af0d20f95e905eef190abf8ea442bbe018171c2 (commit)
      from  49774dc0f635231c09372abff9d8fc31a91e39c0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 15a345934695382ae1dccf6f5c70aaceaecd44de
Merge: 49774dc 6af0d20
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 24 18:09:30 2011 +0200

    Merge branch 'am-tests-environment-fix-merge'

commit 6af0d20f95e905eef190abf8ea442bbe018171c2
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 24 18:08:44 2011 +0200

    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'.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                            |    8 ++++++++
 tests/parallel-tests-reset-term.test |    8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 67bdf6f..63a82fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-04-24  Stefano Lattarini  <address@hidden>
 
+       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-24  Stefano Lattarini  <address@hidden>
+
        tests: fix spurious failure in a test on TESTS (VPATH-related)
        * check-tests-in-builddir.test: When not using the parallel-tests
        option, do not check that VPATH components are not present in the
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
 
 :


hooks/post-receive
-- 
GNU Automake