Module: wine Branch: master Commit: d029a334538d380269a13eeee754d23374685d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d029a334538d380269a13eeee7...
Author: Frédéric Delanoy frederic.delanoy@gmail.com Date: Sun Sep 11 16:54:08 2011 +0200
cmd/tests: Segment CALL tests for an easier read.
---
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@original value@or_broken@buggyXP@or_broken@!FOO! ------------- Testing CALL -------------- +------------ Testing CALL ------------ +... external script ... foo@space@ foo 8 foo@space@@space@ @@ -705,6 +706,7 @@ foo bar@space@ @todo_wine@"" bar@space@ foo ''@space@ '' bar@space@ +... internal routines ... bar :testRoutine foo@space@ foo bar @@ -712,6 +714,7 @@ foo bar @todo_wine@"" bar foo '' '' bar +... with builtins ... @todo_wine@0 @todo_wine@foo created @todo_wine@Should expand foobaz