cmd/tests: Segment CALL tests for an easier read
Frédéric Delanoy
frederic.delanoy at gmail.com
Sun Sep 11 09:54:08 CDT 2011
---
programs/cmd/tests/test_builtins.cmd | 9 +++++----
programs/cmd/tests/test_builtins.cmd.exp | 5 ++++-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index 9a5f786..c5f4bd9 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -1196,9 +1196,9 @@ set FOO=
endlocal
cd .. & rd /s/q foobar
-echo ------------ Testing CALL --------------
+echo ------------ Testing CALL ------------
mkdir foobar & cd foobar
-rem External script
+echo ... external script ...
echo echo foo %%1> foo.cmd
call foo
call foo.cmd 8
@@ -1210,7 +1210,8 @@ call foo.cmd "" bar
call foo.cmd foo ''
call foo.cmd '' bar
del foo.cmd
-rem Internal routines
+
+echo ... internal routines ...
call :testRoutine :testRoutine
goto :endTestRoutine
:testRoutine
@@ -1230,7 +1231,7 @@ echo %1 %2
goto :eof
:endTestRoutineArgs
-rem Should work for builtins...
+echo ... with builtins ...
call mkdir foo
echo %ErrorLevel%
if exist foo (echo foo created) else echo foo should exist!
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 90dfb45..7dd6207 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -696,7 +696,8 @@ footype=foo_opencmd
footype=foo_opencmd
...resetting association
@todo_wine at original value at or_broken@buggyXP at or_broken@!FOO!
------------- Testing CALL --------------
+------------ Testing CALL ------------
+... external script ...
foo at space@
foo 8
foo at space@@space@
@@ -705,6 +706,7 @@ foo bar at space@
@todo_wine@"" bar at space@
foo ''@space@
'' bar at space@
+... internal routines ...
bar :testRoutine
foo at space@
foo bar
@@ -712,6 +714,7 @@ foo bar
@todo_wine@"" bar
foo ''
'' bar
+... with builtins ...
@todo_wine at 0
@todo_wine at foo created
@todo_wine at Should expand foobaz
--
1.7.6
More information about the wine-patches
mailing list