[4/5] cmd/tests: Use resynchronization points to better deal with two IF statements tests.

Francois Gouget fgouget at free.fr
Mon Nov 28 05:14:19 CST 2011


---

This correctly handles the issue mentionned in [1/5]. This lets us 
verify that the foo2 and foo3 checks actually work as expected. Also 
once cmd is fixed to send error messages to stderr, all that's needed is 
to remove the corresponding @todo_wine@ directives.

 programs/cmd/tests/test_builtins.cmd     |    2 ++
 programs/cmd/tests/test_builtins.cmd.exp |    8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index 40a94e6..f03a05e 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -136,10 +136,12 @@ if exist foo (type foo) else echo not supported
 echo --- redirections within IF statements
 if 1==1 echo foo1>bar
 type bar & del bar
+echo ---
 if 1==1 (echo foo2>bar) else echo baz2>bar
 type bar & del bar
 if 1==1 (echo foo3) else echo baz3>bar
 type bar || echo file does not exist, ok
+echo ---
 if 1==1 (echo foo4>bar) else echo baz4>bar
 type bar & del bar
 if 1==0 (echo foo5>bar) else echo baz5>bar
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 069bb0b..a005fc2 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -163,9 +163,11 @@ food21
 @todo_wine at foo@or_broken at not supported
 --- redirections within IF statements
 @todo_wine at foo1
- at todo_wine@foo2
- at todo_wine@foo3
-file does not exist, ok
+---
+foo2
+foo3
+ at todo_wine@file does not exist, ok
+ at todo_wine@---
 foo4
 baz5
 baz6 at space@
-- 
1.7.7.1




More information about the wine-patches mailing list