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.

diff --git a/ChangeLog b/ChangeLog
index 39ab3b16d31d4ff998e6a2028e0dbd9da7f662f7..2de1e05f9fb2843a80257f6aacaa087ae483e3d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-12-15  Stefano Lattarini  <stefano.lattarini@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.lattarini@gmail.com>
 
        tests: fix spurious failure in 'lex3.test'

diff --git a/tests/color2.test b/tests/color2.test
index 50e6c47291e9474d7c7405ae6e170764629c6425..ab5ab82aedc7de0867bdbecc5c5bd68b9955db15 100755 (executable)
--- 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