cmd/tests: Don't use "@pwd@\" when expecting a full path.
This commit is contained in:
parent
f80dd2469f
commit
e9eb86edfb
|
@ -263,8 +263,8 @@ foo
|
||||||
@path@
|
@path@
|
||||||
@path@
|
@path@
|
||||||
~dp0 should be directory containing batch file
|
~dp0 should be directory containing batch file
|
||||||
@pwd@\
|
@drive@@path@
|
||||||
@pwd@\
|
@drive@@path@
|
||||||
CD value @pwd@@or_broken@CD value@space@
|
CD value @pwd@@or_broken@CD value@space@
|
||||||
%
|
%
|
||||||
P
|
P
|
||||||
|
@ -299,8 +299,8 @@ C
|
||||||
C
|
C
|
||||||
'A B'@or_broken@''
|
'A B'@or_broken@''
|
||||||
'C'@or_broken@''
|
'C'@or_broken@''
|
||||||
@pwd@\C D@or_broken@%~ff
|
@drive@@path@C D@or_broken@%~ff
|
||||||
@pwd@\E@or_broken@%~ff
|
@drive@@path@E@or_broken@%~ff
|
||||||
@drive@
|
@drive@
|
||||||
@drive@
|
@drive@
|
||||||
@path@@or_broken@%~pd
|
@path@@or_broken@%~pd
|
||||||
|
@ -335,8 +335,8 @@ N
|
||||||
C
|
C
|
||||||
'A B'@or_broken@''
|
'A B'@or_broken@''
|
||||||
'C'@or_broken@''
|
'C'@or_broken@''
|
||||||
@pwd@\C D
|
@drive@@path@C D
|
||||||
@pwd@\E
|
@drive@@path@E
|
||||||
@drive@
|
@drive@
|
||||||
@drive@
|
@drive@
|
||||||
@path@
|
@path@
|
||||||
|
@ -392,22 +392,22 @@ foo5
|
||||||
foo6@space@
|
foo6@space@
|
||||||
@todo_wine@------------ Testing cd ------------
|
@todo_wine@------------ Testing cd ------------
|
||||||
singleFile
|
singleFile
|
||||||
Current dir: @pwd@\foobar@or_broken@Current dir:@space@
|
Current dir: @drive@@path@foobar@or_broken@Current dir:@space@
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
@pwd@
|
@pwd@
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
@pwd@
|
@pwd@
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
@pwd@
|
@pwd@
|
||||||
@pwd@
|
@pwd@
|
||||||
@pwd@
|
@pwd@
|
||||||
@pwd@\foobar\bar bak
|
@drive@@path@foobar\bar bak
|
||||||
@pwd@\foobar\bar bak
|
@drive@@path@foobar\bar bak
|
||||||
@pwd@\foobar\bar bak
|
@drive@@path@foobar\bar bak
|
||||||
@pwd@\foobar\bar bak
|
@drive@@path@foobar\bar bak
|
||||||
@pwd@\foobar\bar bak
|
@drive@@path@foobar\bar bak
|
||||||
@pwd@
|
@pwd@
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
------------ Testing type ------------
|
------------ Testing type ------------
|
||||||
|
|
||||||
@pwd@>type foobaz@space@
|
@pwd@>type foobaz@space@
|
||||||
|
@ -1090,31 +1090,31 @@ bar\baz removed
|
||||||
--- pushing non-existing dir
|
--- pushing non-existing dir
|
||||||
@pwd@
|
@pwd@
|
||||||
--- basic behaviour
|
--- basic behaviour
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
@pwd@
|
@pwd@
|
||||||
@pwd@\foobar\baz
|
@drive@@path@foobar\baz
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
@pwd@
|
@pwd@
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
@pwd@
|
@pwd@
|
||||||
------------ Testing attrib ------------
|
------------ 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
|
--- 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
|
||||||
foo original contents
|
foo original contents
|
||||||
Read-only file not deleted
|
Read-only file not deleted
|
||||||
Read-only file forcibly deleted
|
Read-only file forcibly deleted
|
||||||
--- recursive behaviour
|
--- recursive behaviour
|
||||||
A @pwd@\foobar\baz\level2@or_broken@A @pwd@\foobar\baz\level2@or_broken@A I @pwd@\foobar\baz\level2
|
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 @pwd@\foobar\level1@or_broken@A R @pwd@\foobar\level1@or_broken@A R I @pwd@\foobar\level1
|
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 @pwd@\foobar\baz\level2@or_broken@A R @pwd@\foobar\baz\level2@or_broken@A R I @pwd@\foobar\baz\level2
|
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 @pwd@\foobar\bar@or_broken@A @pwd@\foobar\bar@or_broken@A I @pwd@\foobar\bar
|
A @drive@@path@foobar\bar@or_broken@A @drive@@path@foobar\bar@or_broken@A I @drive@@path@foobar\bar
|
||||||
--- folders processing
|
--- folders processing
|
||||||
@pwd@\foobar@or_broken@ @pwd@\foobar@or_broken@ I @pwd@\foobar
|
@drive@@path@foobar@or_broken@ @drive@@path@foobar@or_broken@ I @drive@@path@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
|
@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 @pwd@\foobar\baz\toto@or_broken@A @pwd@\foobar\baz\toto@or_broken@A I @pwd@\foobar\baz\toto
|
A @drive@@path@foobar\baz\toto@or_broken@A @drive@@path@foobar\baz\toto@or_broken@A I @drive@@path@foobar\baz\toto
|
||||||
toto
|
toto
|
||||||
lulu
|
lulu
|
||||||
file created in read-only dir
|
file created in read-only dir
|
||||||
|
@ -1251,17 +1251,17 @@ ErrLev: 0
|
||||||
--- setlocal with corresponding endlocal
|
--- setlocal with corresponding endlocal
|
||||||
globalval
|
globalval
|
||||||
localval
|
localval
|
||||||
@pwd@\foobar\foobar2
|
@drive@@path@foobar\foobar2
|
||||||
globalval
|
globalval
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
globalval
|
globalval
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
--- setlocal with no corresponding endlocal
|
--- setlocal with no corresponding endlocal
|
||||||
globalval
|
globalval
|
||||||
localval
|
localval
|
||||||
@pwd@\foobar\foobar2
|
@drive@@path@foobar\foobar2
|
||||||
globalval
|
globalval
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
--- setlocal within same batch program
|
--- setlocal within same batch program
|
||||||
Var1 ok 1
|
Var1 ok 1
|
||||||
Var2 ok 2
|
Var2 ok 2
|
||||||
|
@ -1279,23 +1279,23 @@ Directory is ok 3
|
||||||
--- Extra setlocal in called batch
|
--- Extra setlocal in called batch
|
||||||
value2
|
value2
|
||||||
2set1endvalue1
|
2set1endvalue1
|
||||||
@pwd@\foobar\foodir3
|
@drive@@path@foobar\foodir3
|
||||||
Finished:
|
Finished:
|
||||||
value2
|
value2
|
||||||
@pwd@\foobar\foodir2
|
@drive@@path@foobar\foodir2
|
||||||
value1
|
value1
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
--- Extra endlocal in called batch
|
--- Extra endlocal in called batch
|
||||||
value2
|
value2
|
||||||
value2
|
value2
|
||||||
@pwd@\foobar\foodir2
|
@drive@@path@foobar\foodir2
|
||||||
value2
|
value2
|
||||||
@pwd@\foobar\foodir2
|
@drive@@path@foobar\foodir2
|
||||||
Finished:
|
Finished:
|
||||||
value2
|
value2
|
||||||
@pwd@\foobar\foodir2
|
@drive@@path@foobar\foodir2
|
||||||
value1
|
value1
|
||||||
@pwd@\foobar
|
@drive@@path@foobar
|
||||||
--- endlocal in called function rather than batch pgm is ineffective
|
--- endlocal in called function rather than batch pgm is ineffective
|
||||||
2
|
2
|
||||||
2
|
2
|
||||||
|
|
Loading…
Reference in New Issue