[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-815-g34c3fcb

[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=34c3fcb525bba3510c5cdd9ebd5311632162a35a

The branch, testsuite-work has been updated
       via  34c3fcb525bba3510c5cdd9ebd5311632162a35a (commit)
       via  96f2b96726cf7049e4026f51df52d352809b32a6 (commit)
      from  cbfbccce3e2e56fdf2a5844e6c73db2cb3099a64 (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 34c3fcb525bba3510c5cdd9ebd5311632162a35a
Merge: cbfbccc 96f2b96
Author: Stefano Lattarini <address@hidden>
Date:   Tue May 3 11:06:30 2011 +0200

    Merge branch 'master' into testsuite-work

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

Summary of changes:
 ChangeLog         |    8 ++++++++
 tests/color2.test |    4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4c04c15..48c8acc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-03  Stefano Lattarini  <address@hidden>
 
+       tests: fix spurious failure in 'color2.test'
+       * tests/color2.test: If $MAKE contains command-line arguments (as
+       in e.g., "make -j2"), expect's directive "spawn $env(MAKE)" fails
+       spuriously, because it tries to run "$MAKE" as a single command.
+       Fix this with proper uses of the TCL `eval' builtin.
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
        tests: few more checks on automatic remake support
        * tests/remake-all-1.test: New test, check that the "all" target
        triggers rebuilt of outdated Makefiles.
diff --git a/tests/color2.test b/tests/color2.test
index e0bfdab..26df9b2 100755
--- a/tests/color2.test
+++ b/tests/color2.test
@@ -39,7 +39,7 @@ esac
 # Check that we have a working expect program.
 cat >expect-check <<'END'
 #! /usr/bin/expect -f
-spawn $env(THE_SYSTEM_SHELL) -c :
+eval spawn $env(THE_SYSTEM_SHELL) -c :
 expect eof
 END
 THE_SYSTEM_SHELL=/bin/sh expect -f expect-check \
@@ -105,7 +105,7 @@ test_no_color ()
 
 cat >expect-make <<'END'
 #! /usr/bin/expect -f
-spawn $env(MAKE) -e check
+eval spawn $env(MAKE) -e check
 expect eof
 END
 


hooks/post-receive
-- 
GNU Automake