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

Gc test build #13

Merged
ramarag merged 2 commits into from
Feb 3, 2015
Merged

Gc test build #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
214fb50
Enabling build of GC stress Test
ramarag Feb 3, 2015
438448f
Update stress_run_readme.txt
ramarag Feb 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions tests/src/AllTestProjects.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion tests/src/GC/Stress/Framework/ReliabilityFramework.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/src/GC/Stress/Framework/ReliabilityTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public string BasePath
#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
Expand Down
4 changes: 2 additions & 2 deletions tests/src/GC/Stress/Tests/allocationwithpins.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ static void InducedGen2()
}
}

public static void Main(String[] args)
public static int Main(String[] args)
{
if (GCSettings.IsServerGC == true)
{
Expand Down Expand Up @@ -570,7 +570,7 @@ public static void Main(String[] args)
// Console.WriteLine("Press any key to exit.");
// Console.ReadLine();

Environment.ExitCode = 100;
return 100;
}

};
Expand Down
8 changes: 4 additions & 4 deletions tests/src/GC/Stress/stress_run_readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\Tests.

To run stress:

Expand Down
1 change: 0 additions & 1 deletion tests/src/Regressions/assemblyref/assem.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand Down
4 changes: 4 additions & 0 deletions tests/src/dir.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions tests/src/runtime/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>