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.

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

merged 6 commits into from
Sep 21, 2017

Conversation

navin22
Copy link
Member

@navin22 navin22 commented Sep 18, 2017

  • Adding TestAssets project to the TestPlatform.sln. So that it's restored and built.
  • Fixing some bugs in perf.ps1 script. And adding it to the sln file.
  • Added myget feeds of the adapters to the Nuget.config file.

- Adding TestAssets project to the TestPlatform.sln. So that it's restored and built.
- Fixing some bugs in perf.ps1 script. And adding it to the sln file.
@@ -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

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

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.

@@ -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.

@@ -2,7 +2,7 @@
<!-- Package dependency versions -->
<Import Project="..\..\..\scripts\build\TestPlatform.Dependencies.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
Copy link
Contributor

Choose a reason for hiding this comment

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

Latest Xunit adapter supports net451?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch Sathya, No they don't. I have changed it. Thanks.

@khilangoel
Copy link
Contributor

@dotnet-bot test Windows_NT / Debug Build

@navin22 navin22 merged commit 803a39a into microsoft:master Sep 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants