cmd/tests: Add tests for mixed echo modes.

programs/cmd/tests/test_builtins.cmd

@@ -54,6 +54,17 @@ echo @tab@word
 echo  @tab@word
 echo@tab@@tab@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

programs/cmd/tests/test_builtins.cmd.exp

@@ -99,6 +99,21 @@ word
 @tab@word
 @space@@tab@word
 @tab@word
+------------ Testing mixed echo modes --------------
+@echo on
+if 1==1 echo foo
+if 1==1 @echo bar
+@echo off
+if 1==1 echo foo2
+if 1==1 @echo bar2
+
+@todo_wine@@pwd@>if 1 == 1 echo foo@space@
+foo
+
+@todo_wine@@pwd@>if 1 == 1@space@
+bar
+foo2
+bar2
 ------------ Testing rem --------------
 
 @pwd@>rem Hello@space@