From d23c9ec3c57d45f1f28d80afe0be257c3748604a Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 17 Nov 2016 22:23:43 +0000 Subject: [PATCH] [CMD_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 svn path=/trunk/; revision=73265 --- rostests/winetests/cmd/test_builtins.cmd | 11 +++++++++++ rostests/winetests/cmd/test_builtins.cmd.exp | 17 +++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/rostests/winetests/cmd/test_builtins.cmd b/rostests/winetests/cmd/test_builtins.cmd index eac5dca6f53..38a770066c0 100644 --- a/rostests/winetests/cmd/test_builtins.cmd +++ b/rostests/winetests/cmd/test_builtins.cmd @@ -836,6 +836,17 @@ if 1 GEQ "10" (echo 1 GEQ "10") else echo foo if "1" GEQ "10" (echo 1 GEQ "10") else echo foo if '1' GEQ "10" (echo '1' GEQ "10") else echo foo if "10" GEQ "10" (echo "10" GEQ "10") +echo --- unconditional ampersand after if one line +if "0"=="0" echo 1 & echo 2 & echo 3 else echo 4 +echo --- +echo x & if "0"=="1" echo 1 & echo 2 +echo --- +echo x & if "0"=="1" echo 1 & echo 2 & echo 3 +echo --- +echo x & if "0"=="1" (echo 1 & echo 2 & echo 3) +echo --- +echo x & if "0"=="1" echo 1 & echo 2 & echo 3 else echo 4 +echo --- goto :endIfCompOpsSubroutines rem IF subroutines helpers diff --git a/rostests/winetests/cmd/test_builtins.cmd.exp b/rostests/winetests/cmd/test_builtins.cmd.exp index 67e75e0eee6..c559e3b7c3f 100644 --- a/rostests/winetests/cmd/test_builtins.cmd.exp +++ b/rostests/winetests/cmd/test_builtins.cmd.exp @@ -645,6 +645,19 @@ foo foo '1' GEQ "10" "10" GEQ "10" +--- unconditional ampersand after if one line +1@space@ +2@space@ +3 else echo 4 +--- +x@space@ +--- +x@space@ +--- +x@space@ +--- +x@space@ +--- ------------ Testing for ------------ --- plain FOR A @@ -1045,8 +1058,8 @@ file move succeeded @todo_wine@bar@or_broken@baz read-only files are moveable file moved in subdirectory -@todo_wine@moving a file to itself is a no-op@or_broken@moving a file to itself should be a no-op! -@todo_wine@ErrorLevel: 0@or_broken@ErrorLevel: 1 +moving a file to itself is a no-op@or_broken@moving a file to itself should be a no-op! +ErrorLevel: 0@or_broken@ErrorLevel: 1 --- directory move simple directory move succeeded moving a directory to itself gives error; errlevel 1 -- 2.17.1