[6/6] cmd/tests: Add tests for mixed echo modes (resend) (try 2)

[Frédéric Delanoy]

---
 programs/cmd/tests/test_builtins.cmd     |   11 +++++++++++
 programs/cmd/tests/test_builtins.cmd.exp |   15 +++++++++++++++
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index bce966b..1250e89 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -54,6 +54,17 @@ echo @tab at word
 echo  @tab at word
 echo at tab@@tab at word
 
+echo ------------ Testing mixed echo modes --------------
+echo @echo on> mixedEchoModes.cmd
+echo if 1==1 echo foo>> mixedEchoModes.cmd
+echo if 1==1 @echo bar>> mixedEchoModes.cmd
+echo @echo off>> mixedEchoModes.cmd
+echo if 1==1 echo foo2>> mixedEchoModes.cmd
+echo if 1==1 @echo bar2>> mixedEchoModes.cmd
+type mixedEchoModes.cmd
+cmd /c mixedEchoModes.cmd
+del mixedEchoModes.cmd
+
 echo ------------ Testing rem --------------
 rem Hello
 rem  Hello
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index eb7784f..5c545ed 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -99,6 +99,21 @@ word
 @tab at word
 @space@@tab at word
 @tab at word
+------------ Testing mixed echo modes --------------
+ at echo on
+if 1==1 echo foo
+if 1==1 @echo bar
+ at echo off
+if 1==1 echo foo2
+if 1==1 @echo bar2
+
+ at todo_wine@@pwd@>if 1 == 1 echo foo at space@
+foo
+
+ at todo_wine@@pwd@>if 1 == 1 at space@
+bar
+foo2
+bar2
 ------------ Testing rem --------------
 
 @pwd@>rem Hello at space@
-- 
1.7.6