[CMD_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

svn path=/trunk/; revision=70128

rostests/winetests/cmd/batch.c

@@ -321,13 +321,14 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da
             /* If we rewind to the beginning of the line, don't increment line number */
             line--;
         }
-        else if (!is_exp_resync || (is_exp_resync && !err))
+        else if (!is_exp_resync || !err)
         {
             exp_ptr = exp_nl+1;
             if(exp_nl+1 < exp_data+exp_size && exp_nl[0] == '\r' && exp_nl[1] == '\n')
                 exp_ptr++;
         }
-        if (!is_out_resync || (is_out_resync && !err))
+
+        if (!is_out_resync || !err)
         {
             out_ptr = out_nl+1;
             if(out_nl+1 < out_data+out_size && out_nl[0] == '\r' && out_nl[1] == '\n')

rostests/winetests/cmd/test_builtins.cmd

@@ -15,6 +15,10 @@ echo:
 echo :
 echo:word
 echo :word
+echo/
+echo /
+echo/word
+echo /word
 echo off now
 echo word@space@
 echo word@space@@space@
@@ -47,6 +51,10 @@ echo:
 echo :
 echo:word
 echo :word
+echo/
+echo /
+echo/word
+echo /word
 echo on again
 echo word@space@
 echo word@space@@space@
@@ -667,7 +675,45 @@ if /c==/c (
 ) else (
   echo parameter detection seems to be broken
 )
-
+SET elseIF=0
+if 1 == 1 (
+  SET /a elseIF=%elseIF%+1
+) else if 1 == 1 (
+  SET /a elseIF=%elseIF%+2
+) else (
+  SET /a elseIF=%elseIF%+2
+)
+if %elseIF% == 1 (
+  echo else if seems to work
+) else (
+  echo else if seems to be broken
+)
+SET elseIF=0
+if 1 == 2 (
+  SET /a elseIF=%elseIF%+2
+) else if 1 == 1 (
+  SET /a elseIF=%elseIF%+1
+) else (
+  SET /a elseIF=%elseIF%+2
+)
+if %elseIF% == 1 (
+  echo else if seems to work
+) else (
+  echo else if seems to be broken
+)
+SET elseIF=0
+if 1 == 2 (
+  SET /a elseIF=%elseIF%+2
+) else if 1 == 2 (
+  SET /a elseIF=%elseIF%+2
+) else (
+  SET /a elseIF=%elseIF%+1
+)
+if %elseIF% == 1 (
+  echo else if seems to work
+) else (
+  echo else if seems to be broken
+)
 echo --- case sensitivity with and without /i option
 if bar==BAR echo if does not default to case sensitivity
 if not bar==BAR echo if seems to default to case sensitivity

rostests/winetests/cmd/test_builtins.cmd.exp

@@ -42,6 +42,18 @@ word
 @pwd@>echo :word@space@
 :word
 
+@pwd@>echo/
+
+
+@pwd@>echo /@space@
+/
+
+@pwd@>echo/word
+word
+
+@pwd@>echo /word@space@
+/word
+
 @pwd@>echo off now@space@
 off now
 
@@ -93,6 +105,10 @@ word
 :
 word
 :word
+
+/
+word
+/word
 on again
 word@space@
 word@space@@space@
@@ -438,6 +454,9 @@ Passed: file size check on subdir\a.a [8]@or_broken@Skipping file size check on
 if seems to work
 else seems to work
 if seems not to detect /c as parameter
+else if seems to work
+else if seems to work
+else if seems to work
 --- case sensitivity with and without /i option
 if seems to default to case sensitivity
 if /i seems to work