From 5aa92e84bd53bbe33be1a0ef3767ea4078bc8fd9 Mon Sep 17 00:00:00 2001
From: Bruce Forstall <brucefo@microsoft.com>
Date: Mon, 29 Aug 2016 16:22:57 -0700
Subject: [PATCH] Re-enable stringarr test

I can't get this to fail locally despite thousands of runs.

I fixed the test to detect failure when checking all indices, not
just when checking the last index of the first rank.

Fixes #4844.
---
 tests/issues.targets                                 | 6 ------
 tests/src/JIT/Methodical/MDArray/basics/stringarr.cs | 8 ++++++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/issues.targets b/tests/issues.targets
index 869dfbd..d799848 100644
--- a/tests/issues.targets
+++ b/tests/issues.targets
@@ -266,12 +266,6 @@
     <!-- The following x86 failures only occur with RyuJIT/x86 -->
 
     <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'x86'">
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\MDArray\basics\stringarr_cs_do\stringarr_cs_do.cmd">
-             <Issue>4844</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\MDArray\basics\stringarr_cs_ro\stringarr_cs_ro.cmd">
-             <Issue>4844</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd" >
             <Issue>x86 JIT doesn't support tail call opt</Issue>
         </ExcludeList>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/stringarr.cs b/tests/src/JIT/Methodical/MDArray/basics/stringarr.cs
index 8e93d1f..cf8c6ec 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/stringarr.cs
+++ b/tests/src/JIT/Methodical/MDArray/basics/stringarr.cs
@@ -165,15 +165,17 @@ public class string1
             m++;
         }
 
+        pass = true;
         for (int i = 0; i < size; i++)
         {
-            pass = true;
             for (int j = 0; j < size; j++)
+            {
                 if (ima2d[i, j] != refa2d[i][j])
                 {
                     Console.WriteLine("i={0}, j={1}, imr[i,j] {2}!=refr[i][j] {3}", i, j, ima2d[i, j], refa2d[i][j]);
                     pass = false;
                 }
+            }
         }
 
         if (pass)
@@ -214,15 +216,17 @@ public class string1
             m++;
         }
 
+        pass = true;
         for (int i = 0; i < size; i++)
         {
-            pass = true;
             for (int j = 0; j < size; j++)
+            {
                 if (ima3d[i, size, j] != refa3d[i][j])
                 {
                     Console.WriteLine("i={0}, j={1}, imr[i,{4},j] {2}!=refr[i][j] {3}", i, j, ima3d[i, size, j], refa3d[i][j], size);
                     pass = false;
                 }
+            }
         }
 
         if (pass)
-- 
2.7.4