Enabling build of GC stress Test

diff --git a/tests/src/AllTestProjects.sln b/tests/src/AllTestProjects.sln
index a8aa9f2b03c0f1885cd5459e489abce1d077659d..1b54f77b67be90e7ed7ba8f5dbbb23ac68dc317b 100644 (file)
--- a/tests/src/AllTestProjects.sln
+++ b/tests/src/AllTestProjects.sln
@@ -55,6 +55,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test", "Regressions\assembl
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TypeInitialization", "TypeInitialization", "{B6FB99A0-1E53-4806-AE96-3A157F8B4DFD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GC", "GC", "{68C05500-0698-4309-AFB0-14485AFA1BDB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stress", "Stress", "{A0C4F281-CA64-4794-A786-F3F80FCC5A06}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{776B49A7-C77A-42ED-AFA7-73E255FC889E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReliabilityFramework", "GC\Stress\Framework\ReliabilityFramework.csproj", "{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{48E19BDB-F7F5-4FEF-ABA9-7FEEAC96D265}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC_Stress_tests_collection", "GC\Stress\Tests\GC_Stress_tests_collection.csproj", "{700E904F-A5F0-4B05-835B-EB256F4202B0}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
@@ -183,6 +195,26 @@ Global
                {CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Release|Mixed Platforms.Build.0 = Release|x64
                {CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Release|x64.ActiveCfg = Release|x64
                {CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Release|x64.Build.0 = Release|x64
+               {65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|Any CPU.ActiveCfg = Debug|x64
+               {65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+               {65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|Mixed Platforms.Build.0 = Debug|x64
+               {65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|x64.ActiveCfg = Debug|x64
+               {65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|x64.Build.0 = Debug|x64
+               {65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|Any CPU.ActiveCfg = Release|x64
+               {65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|Mixed Platforms.ActiveCfg = Release|x64
+               {65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|Mixed Platforms.Build.0 = Release|x64
+               {65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|x64.ActiveCfg = Release|x64
+               {65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|x64.Build.0 = Release|x64
+               {700E904F-A5F0-4B05-835B-EB256F4202B0}.Debug|Any CPU.ActiveCfg = Debug|x64
+               {700E904F-A5F0-4B05-835B-EB256F4202B0}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+               {700E904F-A5F0-4B05-835B-EB256F4202B0}.Debug|Mixed Platforms.Build.0 = Debug|x64
+               {700E904F-A5F0-4B05-835B-EB256F4202B0}.Debug|x64.ActiveCfg = Debug|x64
+               {700E904F-A5F0-4B05-835B-EB256F4202B0}.Debug|x64.Build.0 = Debug|x64
+               {700E904F-A5F0-4B05-835B-EB256F4202B0}.Release|Any CPU.ActiveCfg = Release|x64
+               {700E904F-A5F0-4B05-835B-EB256F4202B0}.Release|Mixed Platforms.ActiveCfg = Release|x64
+               {700E904F-A5F0-4B05-835B-EB256F4202B0}.Release|Mixed Platforms.Build.0 = Release|x64
+               {700E904F-A5F0-4B05-835B-EB256F4202B0}.Release|x64.ActiveCfg = Release|x64
+               {700E904F-A5F0-4B05-835B-EB256F4202B0}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@ -208,5 +240,10 @@ Global
                {946AE2D9-F656-4771-81DB-6D02EEEEFFCB} = {76C9FF34-242B-4B47-BC2B-DD78E173D69E}
                {CDA666E1-9A22-4795-9FBD-3B3FAEB759A4} = {76C9FF34-242B-4B47-BC2B-DD78E173D69E}
                {B6FB99A0-1E53-4806-AE96-3A157F8B4DFD} = {3E36F081-F511-4C52-BC3D-2EEFECD3E880}
+               {A0C4F281-CA64-4794-A786-F3F80FCC5A06} = {68C05500-0698-4309-AFB0-14485AFA1BDB}
+               {776B49A7-C77A-42ED-AFA7-73E255FC889E} = {A0C4F281-CA64-4794-A786-F3F80FCC5A06}
+               {65972FF1-AE77-4CB3-B31D-9CA483DD9E2E} = {776B49A7-C77A-42ED-AFA7-73E255FC889E}
+               {48E19BDB-F7F5-4FEF-ABA9-7FEEAC96D265} = {A0C4F281-CA64-4794-A786-F3F80FCC5A06}
+               {700E904F-A5F0-4B05-835B-EB256F4202B0} = {48E19BDB-F7F5-4FEF-ABA9-7FEEAC96D265}
        EndGlobalSection
 EndGlobal

diff --git a/tests/src/GC/Stress/Framework/ReliabilityFramework.cs b/tests/src/GC/Stress/Framework/ReliabilityFramework.cs
index 17d27c8f3b5f23b4a0c410e964329c91740697a7..21e7421966ca8841430819feec541c3c6e169605 100644 (file)
--- a/tests/src/GC/Stress/Framework/ReliabilityFramework.cs
+++ b/tests/src/GC/Stress/Framework/ReliabilityFramework.cs
@@ -4,13 +4,13 @@
 
 #define USE_INSTRUMENTATION
 using System;
-using System.Data;
 using System.Collections;
 using System.Threading;
 using System.Reflection;
 using System.IO;
 #if !PROJECTK_BUILD
 using System.Runtime.Remoting;
+using System.Data;
 #endif 
 using System.Text;
 using System.Diagnostics;

diff --git a/tests/src/GC/Stress/Framework/ReliabilityTest.cs b/tests/src/GC/Stress/Framework/ReliabilityTest.cs
index 242861ea2746afeae7df19db493627e8c47b26d7..eb54fc1eb87cc8054d08c14340b2ad1a4bcef69f 100644 (file)
--- a/tests/src/GC/Stress/Framework/ReliabilityTest.cs
+++ b/tests/src/GC/Stress/Framework/ReliabilityTest.cs
@@ -283,7 +283,7 @@ public class ReliabilityTest
 #if PROJECTK_BUILD
                 string strBVTRoot = Environment.GetEnvironmentVariable("BVT_ROOT");
                 if (String.IsNullOrEmpty(strBVTRoot))
-                    return (Directory.GetCurrentDirectory() + "\\Test");
+                    return (Directory.GetCurrentDirectory() + "\\Tests");
                 else
                     return strBVTRoot;
 #else

diff --git a/tests/src/GC/Stress/Tests/allocationwithpins.cs b/tests/src/GC/Stress/Tests/allocationwithpins.cs
index 185db6139b0a0a59db4b4f6d785f70aa4573bf18..0b2428c0d89deb831e14be4d76cfef42023860b7 100644 (file)
--- a/tests/src/GC/Stress/Tests/allocationwithpins.cs
+++ b/tests/src/GC/Stress/Tests/allocationwithpins.cs
@@ -489,7 +489,7 @@ class FreeListTest
         }
     }
 
-    public static void Main(String[] args) 
+    public static int Main(String[] args)
     {
         if (GCSettings.IsServerGC == true)
         {
@@ -570,7 +570,7 @@ class FreeListTest
 //        Console.WriteLine("Press any key to exit.");
 //        Console.ReadLine();
 
-        Environment.ExitCode = 100;
+        return 100;
     }
 
 };

diff --git a/tests/src/GC/Stress/stress_run_readme.txt b/tests/src/GC/Stress/stress_run_readme.txt
index 3128fd25ab83893a198892ab5c7992e7c75d77b0..3c286b095ece27d12379a8fe912dc65345bca73d 100644 (file)
--- a/tests/src/GC/Stress/stress_run_readme.txt
+++ b/tests/src/GC/Stress/stress_run_readme.txt
@@ -12,15 +12,15 @@ This is a pretty crude implementation. Feel free to improve it!
 
 It has 3 parts:
 
-The stress framework is built from NDP\clr\tests\src\GC\Stress\Framework and the resulting .exe is in %CORE_ROOT%\GC\Stress\Framework\ReliabilityFramework.exe.
+The stress framework is built from <REPO_ROOT>\tests\src\GC\Stress\Framework and the resulting .exe is in <REPO_ROOT>\binaries\tests\<arch>\<buildtype>\GC\Stress\Framework\ReliabilityFramework.exe.
 
-The tests are built from NDP\clr\tests\src\GC\Stress\Tests and the resulting .exe's are in %CORE_ROOT%\GC\Stress\Framework\*.exe.
+The tests are built from <REPO_ROOT>\tests\src\GC\Stress\Tests and the resulting .exe's are in <REPO_ROOT>\binaries\tests\<arch>\<buildtype>\GC\Stress\Framework\*.exe.
 
-The config is at NDP\clr\tests\src\GC\Stress\testmix_gc.config
+The config is at <REPO_ROOT>NDP\clr\tests\src\GC\Stress\testmix_gc.config, this will be copied to the output folder of Framework
 
 3. Running stress
 
-The test .exe's need to be in a directory called Tests next to ReliabilityFramework.exe. So if you keep ReliabilityFramework.exe where it is, you should make a directory called Tests in %CORE_ROOT%\GC\Stress\Framework\ and copy the tests into %CORE_ROOT%\GC\Stress\Framework\Tests.
+The test .exe's need to be in a directory called Tests next to ReliabilityFramework.exe. So if you keep ReliabilityFramework.exe where it is, you should see the test binaries copied to the <REPO_ROOT>\tests\src\GC\Stress\Framework\Test.
 
 To run stress:
 

diff --git a/tests/src/Regressions/assemblyref/assem.csproj b/tests/src/Regressions/assemblyref/assem.csproj
index 7c7c160453b55fb5e953b91b6f7ba39a04f737c7..831bfd3b98a6a9097f15fb229810e49b33d3bd7e 100644 (file)
--- a/tests/src/Regressions/assemblyref/assem.csproj
+++ b/tests/src/Regressions/assemblyref/assem.csproj
@@ -16,7 +16,6 @@
     <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
-    <GenerateRunScript>false</GenerateRunScript>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">

diff --git a/tests/src/dir.targets b/tests/src/dir.targets
index b8b1048a0d4acbe15319041e02b64cee34a1c861..853685d06c56a195afbbd96a2126a0054dd1b7b8 100644 (file)
--- a/tests/src/dir.targets
+++ b/tests/src/dir.targets
@@ -45,6 +45,10 @@
 
   <Import Project="$(ToolsDir)sign.targets" Condition="Exists('$(ToolsDir)sign.targets')" />
 
+  <PropertyGroup>
+    <GenerateRunScript Condition="'$(OutputType.ToUpper())' != 'EXE' And '$(GenerateRunScript)' == ''">false</GenerateRunScript>
+  </PropertyGroup>
+
   <Import Project="CLRTest.Execute.targets" />
   <Target Name="CreateExecuteScript" 
           AfterTargets="Build"

diff --git a/tests/src/runtime/packages.config b/tests/src/runtime/packages.config
index aa99d2cae8faeaad318c8e0f51da2f0388b8b3c3..44de6b72ab6d8cbefa72005691f9af7f4a86a69a 100644 (file)
--- a/tests/src/runtime/packages.config
+++ b/tests/src/runtime/packages.config
@@ -27,5 +27,7 @@
   <package id="System.Threading.Tasks" version="4.0.10-beta-22412" />
   <package id="System.Xml.ReaderWriter" version="4.0.10-beta-22412" />
   <package id="System.Xml.XDocument" version="4.0.0-beta-22412" />
+  <package id="System.Threading.ThreadPool" version="4.0.10-beta-22512" />
+  <package id="System.Threading.Overlapped" version="4.0.0-beta-22512" />
 
 </packages>