Commit e9eb86ed authored by Frédéric Delanoy's avatar Frédéric Delanoy Committed by Alexandre Julliard

cmd/tests: Don't use "@pwd@\" when expecting a full path.

parent f80dd246
......@@ -263,8 +263,8 @@ foo
@path@
@path@
~dp0 should be directory containing batch file
@pwd@\
@pwd@\
@drive@@path@
@drive@@path@
CD value @pwd@@or_broken@CD value@space@
%
P
......@@ -299,8 +299,8 @@ C
C
'A B'@or_broken@''
'C'@or_broken@''
@pwd@\C D@or_broken@%~ff
@pwd@\E@or_broken@%~ff
@drive@@path@C D@or_broken@%~ff
@drive@@path@E@or_broken@%~ff
@drive@
@drive@
@path@@or_broken@%~pd
......@@ -335,8 +335,8 @@ N
C
'A B'@or_broken@''
'C'@or_broken@''
@pwd@\C D
@pwd@\E
@drive@@path@C D
@drive@@path@E
@drive@
@drive@
@path@
......@@ -392,22 +392,22 @@ foo5
foo6@space@
@todo_wine@------------ Testing cd ------------
singleFile
Current dir: @pwd@\foobar@or_broken@Current dir:@space@
@pwd@\foobar
Current dir: @drive@@path@foobar@or_broken@Current dir:@space@
@drive@@path@foobar
@pwd@
@pwd@\foobar
@drive@@path@foobar
@pwd@
@pwd@\foobar
@drive@@path@foobar
@pwd@
@pwd@
@pwd@
@pwd@\foobar\bar bak
@pwd@\foobar\bar bak
@pwd@\foobar\bar bak
@pwd@\foobar\bar bak
@pwd@\foobar\bar bak
@drive@@path@foobar\bar bak
@drive@@path@foobar\bar bak
@drive@@path@foobar\bar bak
@drive@@path@foobar\bar bak
@drive@@path@foobar\bar bak
@pwd@
@pwd@\foobar
@drive@@path@foobar
------------ Testing type ------------
@pwd@>type foobaz@space@
......@@ -1090,31 +1090,31 @@ bar\baz removed
--- pushing non-existing dir
@pwd@
--- basic behaviour
@pwd@\foobar
@drive@@path@foobar
@pwd@
@pwd@\foobar\baz
@pwd@\foobar
@pwd@\foobar
@drive@@path@foobar\baz
@drive@@path@foobar
@drive@@path@foobar
@pwd@
@pwd@\foobar
@drive@@path@foobar
@pwd@
------------ Testing attrib ------------
A @pwd@\foobar\foo@or_broken@A @pwd@\foobar\foo@or_broken@A I @pwd@\foobar\foo
A @drive@@path@foobar\foo@or_broken@A @drive@@path@foobar\foo@or_broken@A I @drive@@path@foobar\foo
--- read-only attribute
A R @pwd@\foobar\foo@or_broken@A R @pwd@\foobar\foo@or_broken@A R I @pwd@\foobar\foo
A R @drive@@path@foobar\foo@or_broken@A R @drive@@path@foobar\foo@or_broken@A R I @drive@@path@foobar\foo
foo
foo original contents
Read-only file not deleted
Read-only file forcibly deleted
--- recursive behaviour
A @pwd@\foobar\baz\level2@or_broken@A @pwd@\foobar\baz\level2@or_broken@A I @pwd@\foobar\baz\level2
A R @pwd@\foobar\level1@or_broken@A R @pwd@\foobar\level1@or_broken@A R I @pwd@\foobar\level1
A R @pwd@\foobar\baz\level2@or_broken@A R @pwd@\foobar\baz\level2@or_broken@A R I @pwd@\foobar\baz\level2
A @pwd@\foobar\bar@or_broken@A @pwd@\foobar\bar@or_broken@A I @pwd@\foobar\bar
A @drive@@path@foobar\baz\level2@or_broken@A @drive@@path@foobar\baz\level2@or_broken@A I @drive@@path@foobar\baz\level2
A R @drive@@path@foobar\level1@or_broken@A R @drive@@path@foobar\level1@or_broken@A R I @drive@@path@foobar\level1
A R @drive@@path@foobar\baz\level2@or_broken@A R @drive@@path@foobar\baz\level2@or_broken@A R I @drive@@path@foobar\baz\level2
A @drive@@path@foobar\bar@or_broken@A @drive@@path@foobar\bar@or_broken@A I @drive@@path@foobar\bar
--- folders processing
@pwd@\foobar@or_broken@ @pwd@\foobar@or_broken@ I @pwd@\foobar
@todo_wine@ R @pwd@\foobar\baz@or_broken@ R @pwd@\foobar\baz@or_broken@ @pwd@\foobar\baz@or_broken@ R I @pwd@\foobar\baz
A @pwd@\foobar\baz\toto@or_broken@A @pwd@\foobar\baz\toto@or_broken@A I @pwd@\foobar\baz\toto
@drive@@path@foobar@or_broken@ @drive@@path@foobar@or_broken@ I @drive@@path@foobar
@todo_wine@ R @drive@@path@foobar\baz@or_broken@ R @drive@@path@foobar\baz@or_broken@ @drive@@path@foobar\baz@or_broken@ R I @drive@@path@foobar\baz
A @drive@@path@foobar\baz\toto@or_broken@A @drive@@path@foobar\baz\toto@or_broken@A I @drive@@path@foobar\baz\toto
toto
lulu
file created in read-only dir
......@@ -1251,17 +1251,17 @@ ErrLev: 0
--- setlocal with corresponding endlocal
globalval
localval
@pwd@\foobar\foobar2
@drive@@path@foobar\foobar2
globalval
@pwd@\foobar
@drive@@path@foobar
globalval
@pwd@\foobar
@drive@@path@foobar
--- setlocal with no corresponding endlocal
globalval
localval
@pwd@\foobar\foobar2
@drive@@path@foobar\foobar2
globalval
@pwd@\foobar
@drive@@path@foobar
--- setlocal within same batch program
Var1 ok 1
Var2 ok 2
......@@ -1279,23 +1279,23 @@ Directory is ok 3
--- Extra setlocal in called batch
value2
2set1endvalue1
@pwd@\foobar\foodir3
@drive@@path@foobar\foodir3
Finished:
value2
@pwd@\foobar\foodir2
@drive@@path@foobar\foodir2
value1
@pwd@\foobar
@drive@@path@foobar
--- Extra endlocal in called batch
value2
value2
@pwd@\foobar\foodir2
@drive@@path@foobar\foodir2
value2
@pwd@\foobar\foodir2
@drive@@path@foobar\foodir2
Finished:
value2
@pwd@\foobar\foodir2
@drive@@path@foobar\foodir2
value1
@pwd@\foobar
@drive@@path@foobar
--- endlocal in called function rather than batch pgm is ineffective
2
2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment