Module: wine Branch: master Commit: e9eb86edfb50d83aa27453ef655f70a073306535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9eb86edfb50d83aa27453ef65... Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Mar 11 00:16:28 2014 +0100 cmd/tests: Don't use "@pwd@\" when expecting a full path. --- 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 1575984..828a651 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -263,8 +263,8 @@ foo @path@ @path@ ~dp0 should be directory containing batch file -(a)pwd@\ -(a)pwd@\ +(a)drive@@path@ +(a)drive@@path@ CD value @pwd@@or_broken(a)CD value(a)space@ % P @@ -299,8 +299,8 @@ C C 'A B'@or_broken@'' 'C'@or_broken@'' -(a)pwd@\C D(a)or_broken@%~ff -(a)pwd@\E(a)or_broken@%~ff +(a)drive@@path(a)C D(a)or_broken@%~ff +(a)drive@@path(a)E@or_broken@%~ff @drive@ @drive@ @path@@or_broken@%~pd @@ -335,8 +335,8 @@ N C 'A B'@or_broken@'' 'C'@or_broken@'' -(a)pwd@\C D -(a)pwd@\E +(a)drive@@path(a)C D +(a)drive@@path(a)E @drive@ @drive@ @path@ @@ -392,22 +392,22 @@ foo5 foo6(a)space@ @todo_wine(a)------------ Testing cd ------------ singleFile -Current dir: @pwd@\foobar(a)or_broken@Current dir:@space@ -(a)pwd@\foobar +Current dir: @drive@@path(a)foobar@or_broken(a)Current dir:@space@ +(a)drive@@path(a)foobar @pwd@ -(a)pwd@\foobar +(a)drive@@path(a)foobar @pwd@ -(a)pwd@\foobar +(a)drive@@path(a)foobar @pwd@ @pwd@ @pwd@ -(a)pwd@\foobar\bar bak -(a)pwd@\foobar\bar bak -(a)pwd@\foobar\bar bak -(a)pwd@\foobar\bar bak -(a)pwd@\foobar\bar bak +(a)drive@@path(a)foobar\bar bak +(a)drive@@path(a)foobar\bar bak +(a)drive@@path(a)foobar\bar bak +(a)drive@@path(a)foobar\bar bak +(a)drive@@path(a)foobar\bar bak @pwd@ -(a)pwd@\foobar +(a)drive@@path(a)foobar ------------ Testing type ------------ @pwd@>type foobaz(a)space@ @@ -1090,31 +1090,31 @@ bar\baz removed --- pushing non-existing dir @pwd@ --- basic behaviour -(a)pwd@\foobar +(a)drive@@path(a)foobar @pwd@ -(a)pwd@\foobar\baz -(a)pwd@\foobar -(a)pwd@\foobar +(a)drive@@path(a)foobar\baz +(a)drive@@path(a)foobar +(a)drive@@path(a)foobar @pwd@ -(a)pwd@\foobar +(a)drive@@path(a)foobar @pwd@ ------------ Testing attrib ------------ -A @pwd@\foobar\foo(a)or_broken@A @pwd@\foobar\foo(a)or_broken@A I @pwd@\foobar\foo +A @drive@@path(a)foobar\foo(a)or_broken@A @drive@@path(a)foobar\foo(a)or_broken@A I @drive@@path(a)foobar\foo --- read-only attribute -A R @pwd@\foobar\foo(a)or_broken@A R @pwd@\foobar\foo(a)or_broken@A R I @pwd@\foobar\foo +A R @drive@@path(a)foobar\foo(a)or_broken@A R @drive@@path(a)foobar\foo(a)or_broken@A R I @drive@@path(a)foobar\foo foo foo original contents Read-only file not deleted Read-only file forcibly deleted --- recursive behaviour -A @pwd@\foobar\baz\level2(a)or_broken@A @pwd@\foobar\baz\level2(a)or_broken@A I @pwd@\foobar\baz\level2 -A R @pwd@\foobar\level1(a)or_broken@A R @pwd@\foobar\level1(a)or_broken@A R I @pwd@\foobar\level1 -A R @pwd@\foobar\baz\level2(a)or_broken@A R @pwd@\foobar\baz\level2(a)or_broken@A R I @pwd@\foobar\baz\level2 -A @pwd@\foobar\bar(a)or_broken@A @pwd@\foobar\bar(a)or_broken@A I @pwd@\foobar\bar +A @drive@@path(a)foobar\baz\level2(a)or_broken@A @drive@@path(a)foobar\baz\level2(a)or_broken@A I @drive@@path(a)foobar\baz\level2 +A R @drive@@path(a)foobar\level1(a)or_broken@A R @drive@@path(a)foobar\level1(a)or_broken@A R I @drive@@path(a)foobar\level1 +A R @drive@@path(a)foobar\baz\level2(a)or_broken@A R @drive@@path(a)foobar\baz\level2(a)or_broken@A R I @drive@@path(a)foobar\baz\level2 +A @drive@@path(a)foobar\bar(a)or_broken@A @drive@@path(a)foobar\bar(a)or_broken@A I @drive@@path(a)foobar\bar --- folders processing - @pwd@\foobar(a)or_broken@ @pwd@\foobar(a)or_broken@ I @pwd@\foobar -(a)todo_wine@ R @pwd@\foobar\baz(a)or_broken@ R @pwd@\foobar\baz(a)or_broken@ @pwd@\foobar\baz(a)or_broken@ R I @pwd@\foobar\baz -A @pwd@\foobar\baz\toto(a)or_broken@A @pwd@\foobar\baz\toto(a)or_broken@A I @pwd@\foobar\baz\toto + @drive@@path(a)foobar@or_broken@ @drive@@path(a)foobar@or_broken@ I @drive@@path(a)foobar +(a)todo_wine@ R @drive@@path(a)foobar\baz(a)or_broken@ R @drive@@path(a)foobar\baz(a)or_broken@ @drive@@path(a)foobar\baz(a)or_broken@ R I @drive@@path(a)foobar\baz +A @drive@@path(a)foobar\baz\toto(a)or_broken@A @drive@@path(a)foobar\baz\toto(a)or_broken@A I @drive@@path(a)foobar\baz\toto toto lulu file created in read-only dir @@ -1251,17 +1251,17 @@ ErrLev: 0 --- setlocal with corresponding endlocal globalval localval -(a)pwd@\foobar\foobar2 +(a)drive@@path(a)foobar\foobar2 globalval -(a)pwd@\foobar +(a)drive@@path(a)foobar globalval -(a)pwd@\foobar +(a)drive@@path(a)foobar --- setlocal with no corresponding endlocal globalval localval -(a)pwd@\foobar\foobar2 +(a)drive@@path(a)foobar\foobar2 globalval -(a)pwd@\foobar +(a)drive@@path(a)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 -(a)pwd@\foobar\foodir3 +(a)drive@@path(a)foobar\foodir3 Finished: value2 -(a)pwd@\foobar\foodir2 +(a)drive@@path(a)foobar\foodir2 value1 -(a)pwd@\foobar +(a)drive@@path(a)foobar --- Extra endlocal in called batch value2 value2 -(a)pwd@\foobar\foodir2 +(a)drive@@path(a)foobar\foodir2 value2 -(a)pwd@\foobar\foodir2 +(a)drive@@path(a)foobar\foodir2 Finished: value2 -(a)pwd@\foobar\foodir2 +(a)drive@@path(a)foobar\foodir2 value1 -(a)pwd@\foobar +(a)drive@@path(a)foobar --- endlocal in called function rather than batch pgm is ineffective 2 2