Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Performance scripts fix. #1105

Merged
merged 6 commits into from
Sep 21, 2017
Merged

Performance scripts fix. #1105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e49bf1b
Performance scripts fix.
navin22 Sep 18, 2017
2ece627
Adding perfomance tests and other tests to TestAssets.sln so that the…
navin22 Sep 20, 2017
4ee57cd
Removing extra space.
navin22 Sep 20, 2017
a26e846
Changing the target frameworks for test assests.
navin22 Sep 21, 2017
e6f251e
Merge branch 'master' into perfautofix
navin22 Sep 21, 2017
28d6f56
Merge branch 'master' into perfautofix
navin22 Sep 21, 2017
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
3 changes: 3 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
<add key="nuint.myget" value="https://www.myget.org/F/nunit/api/v3/index.json" />
<add key="xunit.myget" value="https://www.myget.org/F/xunit/api/v3/index.json" />
<add key="mstest.myget" value="https://dotnet.myget.org/F/mstestv2/api/v3/index.json"/>
</packageSources>
<fallbackPackageFolders>
<clear />
Expand Down
71 changes: 69 additions & 2 deletions TestPlatform.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26703.0
VisualStudioVersion = 15.0.26913.4001
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0C35EB-7F31-4841-A24F-8EB708FFA959}"
EndProject
Expand Down Expand Up @@ -167,7 +167,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataCollectors", "DataColle
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests", "test\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests\Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj", "{21DB138B-85B7-479E-91FE-01E0F972EC56}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventLogUnitTestProject", "test\TestAssets\EventLogUnitTestProject\EventLogUnitTestProject.csproj", "{826CD5AF-44FA-40F6-B731-3980CADED8C0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventLogUnitTestProject", "test\TestAssets\EventLogUnitTestProject\EventLogUnitTestProject.csproj", "{826CD5AF-44FA-40F6-B731-3980CADED8C0}"
Copy link
Contributor

@codito codito Sep 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add these into a separate solution please? (only PerfTestProjects)

I started the work here: #1039, but it's not fully complete. Can give an idea though.

Copy link
Member Author

@navin22 navin22 Sep 20, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added an Extra solution called TestAssets.sln & added most of the perf projects to it. Please take a look.

EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnitAdapterPerfTestProject", "test\TestAssets\NUnitAdapterPerfTestProject\NUnitAdapterPerfTestProject.csproj", "{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnitAdapterPerfTestProject", "test\TestAssets\XUnitAdapterPerfTestProject\XUnitAdapterPerfTestProject.csproj", "{D421D80C-E27B-4A60-9C11-9712C0E05E40}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTestAdapterPerfTestProject", "test\TestAssets\MSTestAdapterPerfTestProject\MSTestAdapterPerfTestProject.csproj", "{D0013BEA-9D2F-4620-88F7-F729099906B0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleRunners", "test\TestAssets\ConsoleRunners\ConsoleRunners.csproj", "{B510BE03-E0FF-499A-B557-F58BD84FC922}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{0D4DF78D-7E5F-4516-B19F-E6AA71A1DBF4}"
ProjectSection(SolutionItems) = preProject
scripts\perf\perf.ps1 = scripts\perf\perf.ps1
scripts\perf\perfconfig.csv = scripts\perf\perfconfig.csv
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -887,6 +901,54 @@ Global
{826CD5AF-44FA-40F6-B731-3980CADED8C0}.Release|x64.Build.0 = Release|Any CPU
{826CD5AF-44FA-40F6-B731-3980CADED8C0}.Release|x86.ActiveCfg = Release|Any CPU
{826CD5AF-44FA-40F6-B731-3980CADED8C0}.Release|x86.Build.0 = Release|Any CPU
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}.Debug|x64.ActiveCfg = Debug|Any CPU
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}.Debug|x64.Build.0 = Debug|Any CPU
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}.Debug|x86.ActiveCfg = Debug|Any CPU
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}.Debug|x86.Build.0 = Debug|Any CPU
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}.Release|Any CPU.Build.0 = Release|Any CPU
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}.Release|x64.ActiveCfg = Release|Any CPU
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}.Release|x64.Build.0 = Release|Any CPU
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}.Release|x86.ActiveCfg = Release|Any CPU
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB}.Release|x86.Build.0 = Release|Any CPU
{D421D80C-E27B-4A60-9C11-9712C0E05E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D421D80C-E27B-4A60-9C11-9712C0E05E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D421D80C-E27B-4A60-9C11-9712C0E05E40}.Debug|x64.ActiveCfg = Debug|Any CPU
{D421D80C-E27B-4A60-9C11-9712C0E05E40}.Debug|x64.Build.0 = Debug|Any CPU
{D421D80C-E27B-4A60-9C11-9712C0E05E40}.Debug|x86.ActiveCfg = Debug|Any CPU
{D421D80C-E27B-4A60-9C11-9712C0E05E40}.Debug|x86.Build.0 = Debug|Any CPU
{D421D80C-E27B-4A60-9C11-9712C0E05E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D421D80C-E27B-4A60-9C11-9712C0E05E40}.Release|Any CPU.Build.0 = Release|Any CPU
{D421D80C-E27B-4A60-9C11-9712C0E05E40}.Release|x64.ActiveCfg = Release|Any CPU
{D421D80C-E27B-4A60-9C11-9712C0E05E40}.Release|x64.Build.0 = Release|Any CPU
{D421D80C-E27B-4A60-9C11-9712C0E05E40}.Release|x86.ActiveCfg = Release|Any CPU
{D421D80C-E27B-4A60-9C11-9712C0E05E40}.Release|x86.Build.0 = Release|Any CPU
{D0013BEA-9D2F-4620-88F7-F729099906B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0013BEA-9D2F-4620-88F7-F729099906B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0013BEA-9D2F-4620-88F7-F729099906B0}.Debug|x64.ActiveCfg = Debug|Any CPU
{D0013BEA-9D2F-4620-88F7-F729099906B0}.Debug|x64.Build.0 = Debug|Any CPU
{D0013BEA-9D2F-4620-88F7-F729099906B0}.Debug|x86.ActiveCfg = Debug|Any CPU
{D0013BEA-9D2F-4620-88F7-F729099906B0}.Debug|x86.Build.0 = Debug|Any CPU
{D0013BEA-9D2F-4620-88F7-F729099906B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D0013BEA-9D2F-4620-88F7-F729099906B0}.Release|Any CPU.Build.0 = Release|Any CPU
{D0013BEA-9D2F-4620-88F7-F729099906B0}.Release|x64.ActiveCfg = Release|Any CPU
{D0013BEA-9D2F-4620-88F7-F729099906B0}.Release|x64.Build.0 = Release|Any CPU
{D0013BEA-9D2F-4620-88F7-F729099906B0}.Release|x86.ActiveCfg = Release|Any CPU
{D0013BEA-9D2F-4620-88F7-F729099906B0}.Release|x86.Build.0 = Release|Any CPU
{B510BE03-E0FF-499A-B557-F58BD84FC922}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B510BE03-E0FF-499A-B557-F58BD84FC922}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B510BE03-E0FF-499A-B557-F58BD84FC922}.Debug|x64.ActiveCfg = Debug|Any CPU
{B510BE03-E0FF-499A-B557-F58BD84FC922}.Debug|x64.Build.0 = Debug|Any CPU
{B510BE03-E0FF-499A-B557-F58BD84FC922}.Debug|x86.ActiveCfg = Debug|Any CPU
{B510BE03-E0FF-499A-B557-F58BD84FC922}.Debug|x86.Build.0 = Debug|Any CPU
{B510BE03-E0FF-499A-B557-F58BD84FC922}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B510BE03-E0FF-499A-B557-F58BD84FC922}.Release|Any CPU.Build.0 = Release|Any CPU
{B510BE03-E0FF-499A-B557-F58BD84FC922}.Release|x64.ActiveCfg = Release|Any CPU
{B510BE03-E0FF-499A-B557-F58BD84FC922}.Release|x64.Build.0 = Release|Any CPU
{B510BE03-E0FF-499A-B557-F58BD84FC922}.Release|x86.ActiveCfg = Release|Any CPU
{B510BE03-E0FF-499A-B557-F58BD84FC922}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -962,6 +1024,11 @@ Global
{D9A30E32-D466-4EC5-B4F2-62E17562279B} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
{21DB138B-85B7-479E-91FE-01E0F972EC56} = {D9A30E32-D466-4EC5-B4F2-62E17562279B}
{826CD5AF-44FA-40F6-B731-3980CADED8C0} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
{A0D2E93B-FF3A-45E5-80DC-05FE1F8759FB} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
{D421D80C-E27B-4A60-9C11-9712C0E05E40} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
{D0013BEA-9D2F-4620-88F7-F729099906B0} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
{B510BE03-E0FF-499A-B557-F58BD84FC922} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
{0D4DF78D-7E5F-4516-B19F-E6AA71A1DBF4} = {EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0541B30C-FF51-4E28-B172-83F5F3934BCD}
Expand Down
20 changes: 14 additions & 6 deletions scripts/perf/perf.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ function Measure-DiscoveryTime($commandtorun, $payload)
{
Write-Log "Discovering Tests in $($payload.containerPath) using $($payload.currentRunner)"
$result = Get-TimeTaken $commandtorun
$result.Action = "Discovery"
$result.Goal = $payload.discoverygoal[$payload.runners.IndexOf($payload.currentRunner)]
$result.Action = "Discovery"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: please clean up the extra spaces

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

$result.Goal = $payload.discoverygoal[$payload.runners.IndexOf("`"$($payload.currentRunner)`"")]
Set-CommonProperties $result $payload
$Script:TPT_Results.Add($result) > $null
}
Expand All @@ -223,7 +223,7 @@ function Measure-ExecutionTime($commandtorun, $payload)
Write-Log "Executing Tests in $($payload.containerPath) using $($payload.currentRunner)"
$result = Get-TimeTaken $commandtorun
$result.Action = "Execution"
$result.Goal = $payload.executiongoal[$payload.runners.IndexOf($payload.currentRunner)]
$result.Goal = $payload.executiongoal[$payload.runners.IndexOf("`"$($payload.currentRunner)`"")]
Set-CommonProperties $result $payload
$Script:TPT_Results.Add($result) > $null
}
Expand Down Expand Up @@ -310,7 +310,7 @@ function Invoke-PerformanceTests
$payload.currentAdapter = $adapter

Measure-DiscoveryTime {&$runnerPath $testContainer --listtests --testadapterpath:$testAdapterPath} $payload
Measure-ExecutionTime {&$runnerPath $testContainer --listtests} $payload
Measure-ExecutionTime {&$runnerPath $testContainer --testadapterpath:$testAdapterPath} $payload
}
elseif($runner -eq "nunit.consolerunner")
{
Expand Down Expand Up @@ -364,7 +364,7 @@ function Invoke-DisplayResults
$Script:TPT_Results | Where-Object {$_.Action -like "Discovery"} | Format-Table 'Runner', 'Adapter', 'Action', 'ElapsedTime', 'Goal', 'Delta', 'Status', 'PayLoad', 'RunnerVersion', 'AdapterVersion' -AutoSize
}

if($DefaultAction -eq "Both" -or $DefaultAction -eq "Discovery")
if($DefaultAction -eq "Both" -or $DefaultAction -eq "Execution")
{
$Script:TPT_Results | Where-Object {$_.Action -like "Execution"} | Format-Table 'Runner', 'Adapter', 'Action', 'ElapsedTime', 'Goal', 'Delta', 'Status', 'PayLoad', 'RunnerVersion', 'AdapterVersion' -AutoSize
}
Expand All @@ -379,6 +379,14 @@ function Invoke-DisplayResults
}

Get-PerfConfigurations
Invoke-InstallBenchmarkModule

if (-not (Get-Module -Name "Benchmark")) {
Invoke-InstallBenchmarkModule
}
else
{
Write-Log "Benchmark module is already installed"
}

Invoke-PerformanceTests
Invoke-DisplayResults