[PATCH 3/9] cmd/tests: fix TODOs in test output (GetCommandline())

[Martin Wilck]

Fix output after "cmd: use GetCommandline() rather than argv" patch.
This also fixes the test case where Wine would hang.
---
 programs/cmd/tests/test_cmdline.cmd     |    3 +--
 programs/cmd/tests/test_cmdline.cmd.exp |   24 ++++++++++++------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd
index d415c9b..f5ee9bb 100755
--- a/programs/cmd/tests/test_cmdline.cmd
+++ b/programs/cmd/tests/test_cmdline.cmd
@@ -85,8 +85,7 @@ cmd /c"say one"
 @rem ignore quote before qualifier
 cmd "/c"say one
 @rem ignore anything before /c
- at rem FIXME the next command in wine starts a sub-CMD
-echo THIS FAILS: cmd ignoreme/c say one
+cmd ignoreme/c say one
 @echo --------- Testing special characters --------------
 @echo @echo amp > "say&.bat"
 call say&
diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp
index 9ddd939..cf061a0 100755
--- a/programs/cmd/tests/test_cmdline.cmd.exp
+++ b/programs/cmd/tests/test_cmdline.cmd.exp
@@ -47,19 +47,19 @@
 @todo_wine at 0@space@
 
 >cmd /c "say one 
- at todo_wine@0 at space@
+0 at space@
 
 >cmd /c say" one" 
-1 at space@
+ at todo_wine@1 at space@
 
 >cmd /c say "one" 
 0 at space@
 
 >cmd /c s"ay one 
-1 at space@
+ at todo_wine@1 at space@
 
 >cmd /c s"aytwo 
-2 at space@
+ at todo_wine@2 at space@
 
 >cmd /c say (3) 
 0 at space@
@@ -72,13 +72,13 @@
 ---------- Testing CMD /C quoting -----------------
 
 >cmd /c @echo "hi" 
- at todo_wine@"hi"
+"hi"
 
 >cmd /c say" "one 
-1 at space@
+ at todo_wine@1 at space@
 
 >cmd /c @echo "\"\\"\\\"\\\\" "\"\\"\\\"\\\\" 
- at todo_wine@"\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\"
+"\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\"
 
 >cmd /c "say one" 
 1 at space@
@@ -87,10 +87,10 @@
 0 at space@
 
 >cmd /s/c ""say one"" 
- at todo_wine@1 at space@
+1 at space@
 
 >cmd /c "say one 
- at todo_wine@0 at space@
+0 at space@
 
 >cmd /c "say"" one" 
 @todo_wine at 0@space@
@@ -99,7 +99,7 @@
 0 at space@@or_broken at 3@space@
 
 >cmd /c ""say (3)"" 
- at todo_wine@3 at space@
+3 at space@
 
 >cmd /c saytwo 
 2 at space@
@@ -126,8 +126,8 @@
 >cmd "/c"say one 
 0 at space@
 
- at todo_wine@>cmd ignoreme/c say one 
- at todo_wine@0 at space@
+>cmd ignoreme/c say one 
+0 at space@
 --------- Testing special characters --------------
 
 @todo_wine@>call say 
-- 
1.7.3.4