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

diff --git a/ChangeLog b/ChangeLog
index a84daca75d145f2dc01b2b21b28830779e08d7cc..a36efe5aa5ad66687bb4131924d38c8176e81030 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-04-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       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  <stefano.lattarini@gmail.com>
 
        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 c98a6b51d2d9cd5d470526d24da93b769b244e1c..3a222c0b8c7cf8df2e2fe82bb70fc8005cf4e6df 100755 (executable)
--- 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
 
 :