Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 3fbe456

Browse files
ramaragramarag
committed
Merge pull request #13 from ramarag/GC_test_build
Enabling GC Stress test build
2 parents 34c2285 + 438448f commit 3fbe456

File tree

8 files changed

+51
-9
lines changed

8 files changed

+51
-9
lines changed

‎tests/src/AllTestProjects.sln

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test", "Regressions\assembl
5555
EndProject
5656
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TypeInitialization", "TypeInitialization", "{B6FB99A0-1E53-4806-AE96-3A157F8B4DFD}"
5757
EndProject
58+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GC", "GC", "{68C05500-0698-4309-AFB0-14485AFA1BDB}"
59+
EndProject
60+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stress", "Stress", "{A0C4F281-CA64-4794-A786-F3F80FCC5A06}"
61+
EndProject
62+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{776B49A7-C77A-42ED-AFA7-73E255FC889E}"
63+
EndProject
64+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReliabilityFramework", "GC\Stress\Framework\ReliabilityFramework.csproj", "{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}"
65+
EndProject
66+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{48E19BDB-F7F5-4FEF-ABA9-7FEEAC96D265}"
67+
EndProject
68+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC_Stress_tests_collection", "GC\Stress\Tests\GC_Stress_tests_collection.csproj", "{700E904F-A5F0-4B05-835B-EB256F4202B0}"
69+
EndProject
5870
Global
5971
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6072
Debug|Any CPU = Debug|Any CPU
@@ -183,6 +195,26 @@ Global
183195
{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Release|Mixed Platforms.Build.0 = Release|x64
184196
{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Release|x64.ActiveCfg = Release|x64
185197
{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Release|x64.Build.0 = Release|x64
198+
{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|Any CPU.ActiveCfg = Debug|x64
199+
{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
200+
{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|Mixed Platforms.Build.0 = Debug|x64
201+
{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|x64.ActiveCfg = Debug|x64
202+
{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|x64.Build.0 = Debug|x64
203+
{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|Any CPU.ActiveCfg = Release|x64
204+
{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|Mixed Platforms.ActiveCfg = Release|x64
205+
{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|Mixed Platforms.Build.0 = Release|x64
206+
{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|x64.ActiveCfg = Release|x64
207+
{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|x64.Build.0 = Release|x64
208+
{700E904F-A5F0-4B05-835B-EB256F4202B0}.Debug|Any CPU.ActiveCfg = Debug|x64
209+
{700E904F-A5F0-4B05-835B-EB256F4202B0}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
210+
{700E904F-A5F0-4B05-835B-EB256F4202B0}.Debug|Mixed Platforms.Build.0 = Debug|x64
211+
{700E904F-A5F0-4B05-835B-EB256F4202B0}.Debug|x64.ActiveCfg = Debug|x64
212+
{700E904F-A5F0-4B05-835B-EB256F4202B0}.Debug|x64.Build.0 = Debug|x64
213+
{700E904F-A5F0-4B05-835B-EB256F4202B0}.Release|Any CPU.ActiveCfg = Release|x64
214+
{700E904F-A5F0-4B05-835B-EB256F4202B0}.Release|Mixed Platforms.ActiveCfg = Release|x64
215+
{700E904F-A5F0-4B05-835B-EB256F4202B0}.Release|Mixed Platforms.Build.0 = Release|x64
216+
{700E904F-A5F0-4B05-835B-EB256F4202B0}.Release|x64.ActiveCfg = Release|x64
217+
{700E904F-A5F0-4B05-835B-EB256F4202B0}.Release|x64.Build.0 = Release|x64
186218
EndGlobalSection
187219
GlobalSection(SolutionProperties) = preSolution
188220
HideSolutionNode = FALSE
@@ -208,5 +240,10 @@ Global
208240
{946AE2D9-F656-4771-81DB-6D02EEEEFFCB} = {76C9FF34-242B-4B47-BC2B-DD78E173D69E}
209241
{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4} = {76C9FF34-242B-4B47-BC2B-DD78E173D69E}
210242
{B6FB99A0-1E53-4806-AE96-3A157F8B4DFD} = {3E36F081-F511-4C52-BC3D-2EEFECD3E880}
243+
{A0C4F281-CA64-4794-A786-F3F80FCC5A06} = {68C05500-0698-4309-AFB0-14485AFA1BDB}
244+
{776B49A7-C77A-42ED-AFA7-73E255FC889E} = {A0C4F281-CA64-4794-A786-F3F80FCC5A06}
245+
{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E} = {776B49A7-C77A-42ED-AFA7-73E255FC889E}
246+
{48E19BDB-F7F5-4FEF-ABA9-7FEEAC96D265} = {A0C4F281-CA64-4794-A786-F3F80FCC5A06}
247+
{700E904F-A5F0-4B05-835B-EB256F4202B0} = {48E19BDB-F7F5-4FEF-ABA9-7FEEAC96D265}
211248
EndGlobalSection
212249
EndGlobal

‎tests/src/GC/Stress/Framework/ReliabilityFramework.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
#define USE_INSTRUMENTATION
66
using System;
7-
using System.Data;
87
using System.Collections;
98
using System.Threading;
109
using System.Reflection;
1110
using System.IO;
1211
#if !PROJECTK_BUILD
1312
using System.Runtime.Remoting;
13+
using System.Data;
1414
#endif
1515
using System.Text;
1616
using System.Diagnostics;

‎tests/src/GC/Stress/Framework/ReliabilityTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ public string BasePath
283283
#if PROJECTK_BUILD
284284
string strBVTRoot = Environment.GetEnvironmentVariable("BVT_ROOT");
285285
if (String.IsNullOrEmpty(strBVTRoot))
286-
return (Directory.GetCurrentDirectory() + "\\Test");
286+
return (Directory.GetCurrentDirectory() + "\\Tests");
287287
else
288288
return strBVTRoot;
289289
#else

‎tests/src/GC/Stress/Tests/allocationwithpins.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ static void InducedGen2()
489489
}
490490
}
491491

492-
public static void Main(String[] args)
492+
public static int Main(String[] args)
493493
{
494494
if (GCSettings.IsServerGC == true)
495495
{
@@ -570,7 +570,7 @@ public static void Main(String[] args)
570570
// Console.WriteLine("Press any key to exit.");
571571
// Console.ReadLine();
572572

573-
Environment.ExitCode = 100;
573+
return 100;
574574
}
575575

576576
};

‎tests/src/GC/Stress/stress_run_readme.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ This is a pretty crude implementation. Feel free to improve it!
1212

1313
It has 3 parts:
1414

15-
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.
15+
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.
1616

17-
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.
17+
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.
1818

19-
The config is at NDP\clr\tests\src\GC\Stress\testmix_gc.config
19+
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
2020

2121
3. Running stress
2222

23-
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.
23+
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\Tests.
2424

2525
To run stress:
2626

‎tests/src/Regressions/assemblyref/assem.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<RestorePackages>true</RestorePackages>
1717
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
1818
<DefineConstants>$(DefineConstants);STATIC</DefineConstants>
19-
<GenerateRunScript>false</GenerateRunScript>
2019
</PropertyGroup>
2120
<!-- Default configurations to help VS understand the configurations -->
2221
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">

‎tests/src/dir.targets

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545

4646
<Import Project="$(ToolsDir)sign.targets" Condition="Exists('$(ToolsDir)sign.targets')" />
4747

48+
<PropertyGroup>
49+
<GenerateRunScript Condition="'$(OutputType.ToUpper())' != 'EXE' And '$(GenerateRunScript)' == ''">false</GenerateRunScript>
50+
</PropertyGroup>
51+
4852
<Import Project="CLRTest.Execute.targets" />
4953
<Target Name="CreateExecuteScript"
5054
AfterTargets="Build"

‎tests/src/runtime/packages.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@
2727
<package id="System.Threading.Tasks" version="4.0.10-beta-22412" />
2828
<package id="System.Xml.ReaderWriter" version="4.0.10-beta-22412" />
2929
<package id="System.Xml.XDocument" version="4.0.0-beta-22412" />
30+
<package id="System.Threading.ThreadPool" version="4.0.10-beta-22512" />
31+
<package id="System.Threading.Overlapped" version="4.0.0-beta-22512" />
3032

3133
</packages>

0 commit comments

Comments
 (0)