Frédéric Delanoy : cmd/tests: Add tests for recursive rmdir.

Alexandre Julliard julliard at winehq.org
Tue Jul 19 12:42:52 CDT 2011


Module: wine
Branch: master
Commit: 23cd306a7d44ac7547e31a6ac390e0c4378d5d3c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=23cd306a7d44ac7547e31a6ac390e0c4378d5d3c

Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date:   Tue Jul 19 09:49:25 2011 +0200

cmd/tests: Add tests for recursive rmdir.

---

 programs/cmd/tests/test_builtins.cmd     |   21 +++++++++++++++++++++
 programs/cmd/tests/test_builtins.cmd.exp |    2 ++
 2 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index 982fd23..a0b243e 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -308,6 +308,27 @@ echo %ErrorLevel%
 if exist foo echo non-empty dir not removed
 rmdir foo\bar
 rmdir foo
+rem Recursive rmdir
+mkdir foo\bar\baz
+rmdir /s /Q foo
+if not exist foo (
+    echo recursive rmdir succeeded
+) else (
+    rd foo\bar\baz
+    rd foo\bar
+    rd foo
+)
+mkdir foo\bar\baz
+echo foo > foo\bar\brol
+rmdir /s /Q foo
+if not exist foo (
+    echo recursive rmdir succeeded
+) else (
+    rd foo\bar\baz
+    del foo\bar\brol
+    rd foo\bar
+    rd foo
+)
 
 echo -----------Testing Errorlevel-----------
 rem nt 4.0 doesn't really support a way of setting errorlevel, so this is weak
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 235d552..3ddd824 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -166,6 +166,8 @@ file not removed
 non-empty dir not removed
 0
 non-empty dir not removed
+recursive rmdir succeeded
+recursive rmdir succeeded
 -----------Testing Errorlevel-----------
 1
 errorlevel just right, good




More information about the wine-cvs mailing list