[4/7] cmd/tests: Additional variable expansion FOR tests
Frédéric Delanoy
frederic.delanoy at gmail.com
Wed Jul 27 18:06:48 CDT 2011
---
programs/cmd/tests/test_builtins.cmd | 18 ++++++++++++++++++
programs/cmd/tests/test_builtins.cmd.exp | 17 +++++++++++++++++
2 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index c9d1d53..4510074 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -262,16 +262,25 @@ if /I foo==FOO echo if /I seems to work
if /I not foo==FOO echo if /I seems to be broken
echo -----------Testing for -----------
+echo ...plain FOR
for %%i in (A B C) do echo %%i
+for %%i in (A B C) do echo %%I
+for %%i in (A B C) do echo %%j
for %%i in (A B C) do call :forTestFun1 %%i
+for %%i in (1,4,1) do echo %%i
+for %%i in (A, B,C) do echo %%i
goto :endForTestFun1
:forTestFun1
echo %1
goto :eof
:endForTestFun1
+echo ...imbricated FORs
for %%i in (X) do (
for %%j in (Y) do (
echo %%i %%j))
+for %%i in (X) do (
+ for %%I in (Y) do (
+ echo %%i %%I))
for %%i in (A B) do (
for %%j in (C D) do (
echo %%i %%j))
@@ -283,6 +292,15 @@ goto :endForTestFun2
echo %1 %2
goto :eof
:endForTestFun2
+mkdir foobar & cd foobar
+mkdir foo
+mkdir bar
+mkdir baz
+echo > bazbaz
+echo ...basic wildcards
+for %%i in (ba*) do echo %%i
+cd ..
+rd /s/Q foobar
echo -----------Testing del /a-----------
del /f/q *.test > nul
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index e0d3cf7..a050c14 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -184,12 +184,27 @@ if seems to default to case sensitivity
if /i seems to work
if /I seems to work
-----------Testing for -----------
+...plain FOR
A
B
C
+%I
+%I
+%I
+%j
+%j
+%j
A
B
C
+1
+4
+1
+A
+B
+C
+...imbricated FORs
+ at todo_wine@X Y
@todo_wine at X Y
@todo_wine at A C
@todo_wine at A D
@@ -199,6 +214,8 @@ C
@todo_wine at A D
@todo_wine at B C
@todo_wine at B D
+...basic wildcards
+bazbaz
-----------Testing del /a-----------
not-r.test not found after delete, good
r.test found before delete, good
--
1.7.6
More information about the wine-patches
mailing list