From 0483adf1f982458b72f3f1c2905aae4b87bf6d34 Mon Sep 17 00:00:00 2001
From: Andy Ayers <andya@microsoft.com>
Date: Wed, 4 Jul 2018 13:33:36 -0700
Subject: [PATCH] Re-enable jit regression test DevDiv_590771
 (dotnet/coreclr#18724)

The issue the test was hitting was worked around in dotnet/coreclr#18292.

Fixes dotnet/coreclr#17967.

Also add GitHub_18522_8 to the arm/arm64 lists (from dotnet/coreclr#18708).

Commit migrated from https://github.com/dotnet/coreclr/commit/2946fdf5c8d66b8fb9ce7c44cef86ba7f81c65db
---
 src/coreclr/tests/arm/Tests.lst   | 16 ++++++++++++++++
 src/coreclr/tests/arm64/Tests.lst | 10 +++++++++-
 src/coreclr/tests/issues.targets  |  3 ---
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/coreclr/tests/arm/Tests.lst b/src/coreclr/tests/arm/Tests.lst
index eac6ca4..b1d07b1 100644
--- a/src/coreclr/tests/arm/Tests.lst
+++ b/src/coreclr/tests/arm/Tests.lst
@@ -94812,3 +94812,19 @@ MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
+[DevDiv_590771.cmd_11912]
+RelativePath=JIT\Regression\JitBlue\DevDiv_590771\DevDiv_590771\DevDiv_590771.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_590771\DevDiv_590771
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS
+HostStyle=0
+
+[GitHub_18522_8.cmd_11913]
+RelativePath=JIT\Regression\JitBlue\GitHub_18522\GitHub_18522_8\GitHub_18522_8.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_18522\GitHub_18522_8
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS
+HostStyle=0
+
diff --git a/src/coreclr/tests/arm64/Tests.lst b/src/coreclr/tests/arm64/Tests.lst
index 9d97229..8c1ee5f 100644
--- a/src/coreclr/tests/arm64/Tests.lst
+++ b/src/coreclr/tests/arm64/Tests.lst
@@ -94729,7 +94729,7 @@ RelativePath=JIT\Regression\JitBlue\DevDiv_590771\DevDiv_590771\DevDiv_590771.cm
 WorkingDir=JIT\Regression\JitBlue\DevDiv_590771\DevDiv_590771
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=EXPECTED_FAIL;17967;EXCLUDED
+Categories=EXPECTED_PASS
 HostStyle=0
 
 [GitHub_18482.cmd_12219]
@@ -94827,6 +94827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
+
 [GitHub_18362.cmd_12231]
 RelativePath=JIT\Regression\JitBlue\GitHub_18362\GitHub_18362\GitHub_18362.cmd
 WorkingDir=JIT\Regression\JitBlue\GitHub_18362\GitHub_18362
@@ -94835,3 +94836,10 @@ MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
+[GitHub_18522_8.cmd_12232]
+RelativePath=JIT\Regression\JitBlue\GitHub_18522\GitHub_18522_8\GitHub_18522_8.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_18522\GitHub_18522_8
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS
+HostStyle=0
diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets
index 8e3b7cc..e83b41f 100644
--- a/src/coreclr/tests/issues.targets
+++ b/src/coreclr/tests/issues.targets
@@ -238,9 +238,6 @@
     <!-- The following are ARM64_altjit crossgen failures. For x64_arm64_altjit buildArm==x64. -->
 
     <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'x64'">
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\DevDiv_590771\DevDiv_590771\DevDiv_590771.cmd">
-            <Issue>17967</Issue>
-        </ExcludeList>
     </ItemGroup>
 
     <!-- Tests that need to be triaged for vararg usage as that is not supported -->
-- 
2.7.4