From a5130e9dabf33fbe3e0bf4a6884baa92a7269bcf Mon Sep 17 00:00:00 2001
From: Pat Gavlin <pagavlin@microsoft.com>
Date: Tue, 9 May 2017 20:41:05 -0700
Subject: [PATCH] Disable a few long-running tests.

These tests consistently time out under GC stress or heap verification.
Each disabled test is known to complete successfully given adequate
time.


Commit migrated from https://github.com/dotnet/coreclr/commit/8ada9acdf8895d313ad71cbeb2dab4e92b02853f
---
 src/coreclr/tests/src/GC/Features/HeapExpansion/pluggaps.csproj        | 2 +-
 src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.csproj           | 3 ++-
 src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj     | 2 +-
 src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj   | 3 ++-
 .../tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj  | 2 +-
 .../tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj  | 2 +-
 src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj              | 1 +
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/coreclr/tests/src/GC/Features/HeapExpansion/pluggaps.csproj b/src/coreclr/tests/src/GC/Features/HeapExpansion/pluggaps.csproj
index 8a1f7a4..0250cab 100644
--- a/src/coreclr/tests/src/GC/Features/HeapExpansion/pluggaps.csproj
+++ b/src/coreclr/tests/src/GC/Features/HeapExpansion/pluggaps.csproj
@@ -10,7 +10,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <GCStressIncompatible>true</GCStressIncompatible>
-    <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible>
+    <HeapVerifyIncompatible>true</HeapVerifyIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.csproj b/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.csproj
index 3bc8399..61fe610 100644
--- a/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.csproj
+++ b/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.csproj
@@ -9,6 +9,7 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
@@ -34,4 +35,4 @@
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj
index 9cd1843..2271820 100644
--- a/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj
@@ -33,4 +33,4 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj
index c5f459d..6311f4e 100644
--- a/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj
@@ -10,6 +10,7 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,4 +35,4 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj
index 79560c5..db9b406 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj
@@ -12,7 +12,7 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
     <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible -->
-    <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
+    <GCStressIncompatible>true</GCStressIncompatible>
     <HeapVerifyIncompatible>true</HeapVerifyIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj
index df11c82..8316681 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj
@@ -12,7 +12,7 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
     <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible -->
-    <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
+    <GCStressIncompatible>true</GCStressIncompatible>
     <HeapVerifyIncompatible>true</HeapVerifyIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj b/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj
index 18d15ed..f9e8bb1 100644
--- a/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj
+++ b/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj
@@ -10,6 +10,7 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-- 
2.7.4