diff options
| -rw-r--r-- | tests/gcSimulatorTests.txt | 2 | ||||
| -rw-r--r-- | tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj | 4 | ||||
| -rw-r--r-- | tests/src/GC/Scenarios/GCSimulator/GCSimulator_1.csproj | 51 |
3 files changed, 4 insertions, 53 deletions
diff --git a/tests/gcSimulatorTests.txt b/tests/gcSimulatorTests.txt index 9b990f9264..4db5d38882 100644 --- a/tests/gcSimulatorTests.txt +++ b/tests/gcSimulatorTests.txt @@ -1,3 +1,4 @@ +GC/Scenarios/GCSimulator/GCSimulator_100/GCSimulator.sh GC/Scenarios/GCSimulator/GCSimulator_100/GCSimulator_100.sh GC/Scenarios/GCSimulator/GCSimulator_101/GCSimulator_101.sh GC/Scenarios/GCSimulator/GCSimulator_102/GCSimulator_102.sh @@ -108,7 +109,6 @@ GC/Scenarios/GCSimulator/GCSimulator_197/GCSimulator_197.sh GC/Scenarios/GCSimulator/GCSimulator_198/GCSimulator_198.sh GC/Scenarios/GCSimulator/GCSimulator_199/GCSimulator_199.sh GC/Scenarios/GCSimulator/GCSimulator_19/GCSimulator_19.sh -GC/Scenarios/GCSimulator/GCSimulator_1/GCSimulator_1.sh GC/Scenarios/GCSimulator/GCSimulator_200/GCSimulator_200.sh GC/Scenarios/GCSimulator/GCSimulator_201/GCSimulator_201.sh GC/Scenarios/GCSimulator/GCSimulator_202/GCSimulator_202.sh diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj index 9786d7c8dd..86ee137cfc 100644 --- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj +++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj @@ -15,7 +15,9 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants> - <CLRTestKind>BuildOnly</CLRTestKind> + <CLRTestKind>BuildAndRun</CLRTestKind> + <IsGCSimulatorTest>true</IsGCSimulatorTest> + <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 2 -dp 0.0 -dw 0.4</CLRTestExecutionArguments> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_1.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_1.csproj deleted file mode 100644 index 4f308a8b72..0000000000 --- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_1.csproj +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> - <OutputType>Exe</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> - <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants> - <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 2 -dp 0.0 -dw 0.4</CLRTestExecutionArguments> - <IsGCSimulatorTest>true</IsGCSimulatorTest> - <CLRTestKind>RunOnly</CLRTestKind> - <CLRTestProjectToRun>GCSimulator.csproj</CLRTestProjectToRun> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> - <ItemGroup> - <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> - <Visible>False</Visible> - </CodeAnalysisDependentAssemblyPaths> - </ItemGroup> - <ItemGroup> - <Compile Include="GCSimulator.cs" /> - <Compile Include="lifetimefx.cs" /> - </ItemGroup> - <ItemGroup> - <None Include="app.config" /> - <None Include="$(GCPackagesConfigFileDirectory)extra\project.json" /> - </ItemGroup> - <PropertyGroup> - <ProjectJson>$(GCPackagesConfigFileDirectory)extra\project.json</ProjectJson> - <ProjectLockJson>$(GCPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson> - </PropertyGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> - </PropertyGroup> -</Project> |