[1/2] cmd/tests: Don't use "@pwd@\" when expecting a full path
Frédéric Delanoy
frederic.delanoy at gmail.com
Sun Mar 9 12:50:22 CDT 2014
That doesn't work when script is run from drive root directory.
---
programs/cmd/tests/test_builtins.cmd.exp | 84 ++++++++++++++++----------------
1 file changed, 42 insertions(+), 42 deletions(-)
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 7380185..f64f3e4 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -260,8 +260,8 @@ foo
'apple"banana"grape'
------------ Testing variable expansion ------------
~dp0 should be directory containing batch file
- at pwd@\
- at pwd@\
+ at drive@@path@
+ at drive@@path@
CD value @pwd@@or_broken at CD value at space@
%
P
@@ -296,8 +296,8 @@ C
C
'A B'@or_broken@''
'C'@or_broken@''
- at pwd@\C D at or_broken@%~ff
- at pwd@\E at or_broken@%~ff
+ at drive@@path at C D at or_broken@%~ff
+ at drive@@path at E@or_broken@%~ff
@drive@
@drive@
@path@@or_broken@%~pd
@@ -332,8 +332,8 @@ N
C
'A B'@or_broken@''
'C'@or_broken@''
- at pwd@\C D
- at pwd@\E
+ at drive@@path at C D
+ at drive@@path at E
@drive@
@drive@
@path@
@@ -389,22 +389,22 @@ foo5
foo6 at space@
@todo_wine at ------------ Testing cd ------------
singleFile
-Current dir: @pwd@\foobar at or_broken@Current dir:@space@
- at pwd@\foobar
+Current dir: @drive@@path at foobar@or_broken at Current dir:@space@
+ at drive@@path at foobar
@pwd@
- at pwd@\foobar
+ at drive@@path at foobar
@pwd@
- at pwd@\foobar
+ at drive@@path at foobar
@pwd@
@pwd@
@pwd@
- at pwd@\foobar\bar bak
- at pwd@\foobar\bar bak
- at pwd@\foobar\bar bak
- at pwd@\foobar\bar bak
- at pwd@\foobar\bar bak
+ at drive@@path at foobar\bar bak
+ at drive@@path at foobar\bar bak
+ at drive@@path at foobar\bar bak
+ at drive@@path at foobar\bar bak
+ at drive@@path at foobar\bar bak
@pwd@
- at pwd@\foobar
+ at drive@@path at foobar
------------ Testing type ------------
@pwd@>type foobaz at space@
@@ -1087,31 +1087,31 @@ bar\baz removed
--- pushing non-existing dir
@pwd@
--- basic behaviour
- at pwd@\foobar
+ at drive@@path at foobar
@pwd@
- at pwd@\foobar\baz
- at pwd@\foobar
- at pwd@\foobar
+ at drive@@path at foobar\baz
+ at drive@@path at foobar
+ at drive@@path at foobar
@pwd@
- at pwd@\foobar
+ at drive@@path at foobar
@pwd@
------------ Testing attrib ------------
-A @pwd@\foobar\foo at or_broken@A @pwd@\foobar\foo at or_broken@A I @pwd@\foobar\foo
+A @drive@@path at foobar\foo at or_broken@A @drive@@path at foobar\foo at or_broken@A I @drive@@path at foobar\foo
--- read-only attribute
-A R @pwd@\foobar\foo at or_broken@A R @pwd@\foobar\foo at or_broken@A R I @pwd@\foobar\foo
+A R @drive@@path at foobar\foo at or_broken@A R @drive@@path at foobar\foo at or_broken@A R I @drive@@path at foobar\foo
foo
foo original contents
Read-only file not deleted
Read-only file forcibly deleted
--- recursive behaviour
-A @pwd@\foobar\baz\level2 at or_broken@A @pwd@\foobar\baz\level2 at or_broken@A I @pwd@\foobar\baz\level2
-A R @pwd@\foobar\level1 at or_broken@A R @pwd@\foobar\level1 at or_broken@A R I @pwd@\foobar\level1
-A R @pwd@\foobar\baz\level2 at or_broken@A R @pwd@\foobar\baz\level2 at or_broken@A R I @pwd@\foobar\baz\level2
-A @pwd@\foobar\bar at or_broken@A @pwd@\foobar\bar at or_broken@A I @pwd@\foobar\bar
+A @drive@@path at foobar\baz\level2 at or_broken@A @drive@@path at foobar\baz\level2 at or_broken@A I @drive@@path at foobar\baz\level2
+A R @drive@@path at foobar\level1 at or_broken@A R @drive@@path at foobar\level1 at or_broken@A R I @drive@@path at foobar\level1
+A R @drive@@path at foobar\baz\level2 at or_broken@A R @drive@@path at foobar\baz\level2 at or_broken@A R I @drive@@path at foobar\baz\level2
+A @drive@@path at foobar\bar at or_broken@A @drive@@path at foobar\bar at or_broken@A I @drive@@path at foobar\bar
--- folders processing
- @pwd@\foobar at or_broken@ @pwd@\foobar at or_broken@ I @pwd@\foobar
- at todo_wine@ R @pwd@\foobar\baz at or_broken@ R @pwd@\foobar\baz at or_broken@ @pwd@\foobar\baz at or_broken@ R I @pwd@\foobar\baz
-A @pwd@\foobar\baz\toto at or_broken@A @pwd@\foobar\baz\toto at or_broken@A I @pwd@\foobar\baz\toto
+ @drive@@path at foobar@or_broken@ @drive@@path at foobar@or_broken@ I @drive@@path at foobar
+ at todo_wine@ R @drive@@path at foobar\baz at or_broken@ R @drive@@path at foobar\baz at or_broken@ @drive@@path at foobar\baz at or_broken@ R I @drive@@path at foobar\baz
+A @drive@@path at foobar\baz\toto at or_broken@A @drive@@path at foobar\baz\toto at or_broken@A I @drive@@path at foobar\baz\toto
toto
lulu
file created in read-only dir
@@ -1248,17 +1248,17 @@ ErrLev: 0
--- setlocal with corresponding endlocal
globalval
localval
- at pwd@\foobar\foobar2
+ at drive@@path at foobar\foobar2
globalval
- at pwd@\foobar
+ at drive@@path at foobar
globalval
- at pwd@\foobar
+ at drive@@path at foobar
--- setlocal with no corresponding endlocal
globalval
localval
- at pwd@\foobar\foobar2
+ at drive@@path at foobar\foobar2
globalval
- at pwd@\foobar
+ at drive@@path at foobar
--- setlocal within same batch program
Var1 ok 1
Var2 ok 2
@@ -1276,23 +1276,23 @@ Directory is ok 3
--- Extra setlocal in called batch
value2
2set1endvalue1
- at pwd@\foobar\foodir3
+ at drive@@path at foobar\foodir3
Finished:
value2
- at pwd@\foobar\foodir2
+ at drive@@path at foobar\foodir2
value1
- at pwd@\foobar
+ at drive@@path at foobar
--- Extra endlocal in called batch
value2
value2
- at pwd@\foobar\foodir2
+ at drive@@path at foobar\foodir2
value2
- at pwd@\foobar\foodir2
+ at drive@@path at foobar\foodir2
Finished:
value2
- at pwd@\foobar\foodir2
+ at drive@@path at foobar\foodir2
value1
- at pwd@\foobar
+ at drive@@path at foobar
--- endlocal in called function rather than batch pgm is ineffective
2
2
--
1.9.0
More information about the wine-patches
mailing list