* tests/color2.test: (expect-make): Add an "expect eof" directive, so that the collected output from the spawned make program will be displayed on stdout, as desired. Since we are at it, also correctly remove a temporary file which we was trying to delete using a wrong filename.
Problem introduced in merge `v1.11-1579-g8d3466c', probably by a botched edit or conflict resolution. --- ChangeLog | 11 +++++++++++ tests/color2.test | 3 ++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39ab3b1..2de1e05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2011-12-15 Stefano Lattarini <stefano.lattar...@gmail.com> + tests: fix spurious failure in 'color2.test' + * tests/color2.test: (expect-make): Add an "expect eof" directive, + so that the collected output from the spawned make program will be + displayed on stdout, as desired. + Since we are at it, also correctly remove a temporary file which + we was trying to delete using a wrong filename. + Problem introduced in merge `v1.11-1579-g8d3466c', probably by a + botched edit or conflict resolution. + +2011-12-15 Stefano Lattarini <stefano.lattar...@gmail.com> + tests: fix spurious failure in 'lex3.test' * tests/lex3.test (foo.l): Remove duplicated definition of `yywrap'. Problem introduced in merge `v1.11-1579-g8d3466c'. diff --git a/tests/color2.test b/tests/color2.test index 50e6c47..ab5ab82 100755 --- a/tests/color2.test +++ b/tests/color2.test @@ -65,7 +65,7 @@ exit 1 END MAKE=$MAKE expect -f expect-check \ || skip_ "make spawned by expect should have a tty stdout" -rm -f check Makefile +rm -f expect-check Makefile # Do the tests. @@ -161,6 +161,7 @@ test_no_color () cat >expect-make <<'END' eval spawn $env(MAKE) -e check +expect eof END for vpath in false :; do -- 1.7.2.3