Frédéric Delanoy : cmd/tests: Segment mkdir tests for an easier read.

[Alexandre Julliard]

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

Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com>
Date:   Mon Sep 12 20:28:03 2011 +0200

cmd/tests: Segment mkdir tests for an easier read.

---

 programs/cmd/tests/test_builtins.cmd     |   12 ++++++------
 programs/cmd/tests/test_builtins.cmd.exp |    6 ++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index 046e6e4..7551e57 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -881,14 +881,14 @@ rmdir "foo bar"
 
 echo ----------- Testing mkdir -----------
 call :setError 0
-rem md and mkdir are synonymous
+echo ... md and mkdir are synonymous ...
 mkdir foobar
 echo %ErrorLevel%
 rmdir foobar
 md foobar
 echo %ErrorLevel%
 rmdir foobar
-rem Creating an already existing directory/file must fail
+echo ... creating an already existing directory/file must fail ...
 mkdir foobar
 md foobar
 echo %ErrorLevel%
@@ -897,7 +897,7 @@ echo > foobar
 mkdir foobar
 echo %ErrorLevel%
 del foobar
-rem Multi-level path creation
+echo ... multilevel path creation ...
 mkdir foo
 echo %ErrorLevel%
 mkdir foo\bar\baz
@@ -922,13 +922,13 @@ rmdir bar
 cd ..
 rmdir foo
 echo %ErrorLevel%
-rem Trailing backslashes
+echo ... trailing backslashes ...
 mkdir foo\\\\
 echo %ErrorLevel%
 if exist foo (rmdir foo & echo dir created
 ) else ( echo dir not created )
 echo %ErrorLevel%
-rem Invalid chars
+echo ... invalid chars ...
 mkdir ?
 echo mkdir ? gives errorlevel %ErrorLevel%
 call :setError 0
@@ -954,7 +954,7 @@ if not exist foo (
     cd ..
     rmdir foo
 )
-rem multiples directories at once
+echo ... multiple directories at once ...
 mkdir foobaz & cd foobaz
 mkdir foo bar\baz foobar
 if exist foo (echo foo created) else echo foo not created!
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 1e2e3df..733e1d5 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -595,10 +595,13 @@ del /q * succeeded on file1
 del /q * succeeded on file2.dat
 ------------ Testing del /s --------------
 ----------- Testing mkdir -----------
+... md and mkdir are synonymous ...
 0
 0
+... creating an already existing directory/file must fail ...
 1
 1
+... multilevel path creation ...
 0
 0
 0
@@ -607,15 +610,18 @@ del /q * succeeded on file2.dat
 1
 0
 0
+... trailing backslashes ...
 0
 dir created
 0
+... invalid chars ...
 mkdir ? gives errorlevel 1
 mkdir ?\foo gives errorlevel 1
 mkdir foo\? gives errorlevel 1
 ok, foo created
 mkdir foo\bar\? gives errorlevel 1
 ok, foo\bar created
+... multiple directories at once ...
 foo created
 bar created
 foobar created