From 9cd4c53ae9d33938c017c832fb38241b232b80d1 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 4 Jun 2016 18:00:50 +0000 Subject: [PATCH] [CMD_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 svn path=/trunk/; revision=71518 --- rostests/winetests/cmd/test_builtins.cmd | 8 ++++---- rostests/winetests/cmd/test_builtins.cmd.exp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rostests/winetests/cmd/test_builtins.cmd b/rostests/winetests/cmd/test_builtins.cmd index cf2559aec48..eac5dca6f53 100644 --- a/rostests/winetests/cmd/test_builtins.cmd +++ b/rostests/winetests/cmd/test_builtins.cmd @@ -1072,16 +1072,16 @@ call :ValidateExpected echo for /R passed echo --- Complex wildcards unix and windows slash cd .. -echo Windows slashs, valid path +echo Windows slashes, valid path for %%f in (foobar\baz\bazbaz) do echo ASIS: %%f for %%f in (foobar\baz\*) do echo WC : %%f -echo Windows slashs, invalid path +echo Windows slashes, invalid path for %%f in (foobar\jim\bazbaz) do echo ASIS: %%f for %%f in (foobar\jim\*) do echo WC : %%f -echo Unix slashs, valid path +echo Unix slashes, valid path for %%f in (foobar/baz/bazbaz) do echo ASIS: %%f for %%f in (foobar/baz/*) do echo WC : %%f -echo Unix slashs, invalid path +echo Unix slashes, invalid path for %%f in (foobar/jim/bazbaz) do echo ASIS: %%f for %%f in (foobar/jim/*) do echo WC : %%f echo Done diff --git a/rostests/winetests/cmd/test_builtins.cmd.exp b/rostests/winetests/cmd/test_builtins.cmd.exp index 7543b53959a..82b13f777e5 100644 --- a/rostests/winetests/cmd/test_builtins.cmd.exp +++ b/rostests/winetests/cmd/test_builtins.cmd.exp @@ -714,15 +714,15 @@ With duplicates enumeration Strip missing wildcards, keep unwildcarded names for /R passed --- Complex wildcards unix and windows slash -Windows slashs, valid path +Windows slashes, valid path ASIS: foobar\baz\bazbaz WC : foobar\baz\bazbaz -Windows slashs, invalid path +Windows slashes, invalid path ASIS: foobar\jim\bazbaz -Unix slashs, valid path +Unix slashes, valid path ASIS: foobar/baz/bazbaz WC : bazbaz -Unix slashs, invalid path +Unix slashes, invalid path ASIS: foobar/jim/bazbaz Done --- for /L