From 803a39a83c68e7ee9217a92f06668e39a291b2a0 Mon Sep 17 00:00:00 2001 From: Navin Date: Thu, 21 Sep 2017 15:38:52 +0530 Subject: [PATCH] Performance scripts fix. (#1105) * Performance scripts fix. - 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. * Adding perfomance tests and other tests to TestAssets.sln so that the TestPlatform.Sln tests will be less and opens fast in VS. * Removing extra space. * Changing the target frameworks for test assests. --- NuGet.config | 3 + TestPlatform.sln | 146 ++---------------- scripts/build.ps1 | 6 + scripts/perf/perf.ps1 | 18 ++- test/TestAssets/TestAssets.sln/TestAssets.sln | 97 ++++++++++++ 5 files changed, 128 insertions(+), 142 deletions(-) create mode 100644 test/TestAssets/TestAssets.sln/TestAssets.sln diff --git a/NuGet.config b/NuGet.config index eb9f7eadf9..f6ad7d7e1e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,9 @@ + + + diff --git a/TestPlatform.sln b/TestPlatform.sln index 15002fe6db..4d98e586fa 100644 --- a/TestPlatform.sln +++ b/TestPlatform.sln @@ -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 @@ -100,18 +100,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{D27E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssets", "TestAssets", "{8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProject", "test\TestAssets\SimpleTestProject\SimpleTestProject.csproj", "{22C2F754-11A1-435A-9F64-645CD4C1C31A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProject2", "test\TestAssets\SimpleTestProject2\SimpleTestProject2.csproj", "{B619F69F-6864-4A6E-894A-C02E5FB0128F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUTestProject", "test\TestAssets\NUTestProject\NUTestProject.csproj", "{D68733FF-7520-4906-AE35-B7B9DBAC543F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUTestProject", "test\TestAssets\XUTestProject\XUTestProject.csproj", "{A23E3408-D569-488E-A071-E1B3625C5F09}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerfTestProject", "test\TestAssets\PerfTestProject\PerfTestProject.csproj", "{57B182B8-9014-4C6D-B966-B464DE3127D5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleDataCollector", "test\TestAssets\SimpleDataCollector\SimpleDataCollector.csproj", "{D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Protocol", "samples\Microsoft.TestPlatform.Protocol\Microsoft.TestPlatform.Protocol.csproj", "{97DD9467-B011-4736-AAC4-2C21BF554349}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Build.UnitTests", "test\Microsoft.TestPlatform.Build.UnitTests\Microsoft.TestPlatform.Build.UnitTests.csproj", "{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E}" @@ -128,8 +116,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "datacollector.PlatformTests EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcDataCollector", "test\TestAssets\OutOfProcDataCollector\OutOfProcDataCollector.csproj", "{CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DED1590A-ED25-413B-8590-006A4DD5B2FD}" ProjectSection(SolutionItems) = preProject scripts\build\TestPlatform.Dependencies.props = scripts\build\TestPlatform.Dependencies.props @@ -137,8 +123,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DED1590A scripts\build\TestPlatform.targets = scripts\build\TestPlatform.targets EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUPerfTestProject", "test\TestAssets\XUPerfTestProject\XUPerfTestProject.csproj", "{40A8D686-5DD4-4591-9194-DA236577AB0C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "package", "src\package\package\package.csproj", "{E141A226-CC0A-4F26-BD17-4AE427D81C3B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{376C19DE-31E2-4FF6-88FC-0D0D6233C999}" @@ -155,8 +139,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Exte EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests", "test\Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests\Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj", "{488675EC-C8BB-40E0-AD4F-91F623D548B3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlameUnitTestProject", "test\TestAssets\BlameUnitTestProject\BlameUnitTestProject.csproj", "{6B2B841C-CCFF-469A-9939-EB07EA0401AE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleProjectWithOldTestHost", "test\TestAssets\SampleProjectWithOldTestHost\SampleProjectWithOldTestHost.csproj", "{DFF82C76-9498-4E8B-8B5E-D12E2B92FA46}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataCollectors", "DataCollectors", "{B705537C-B82C-4A30-AFA5-6244D9A7DAEB}" @@ -167,7 +149,13 @@ 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}" +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 @@ -563,78 +551,6 @@ Global {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|x64.Build.0 = Release|Any CPU {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|x86.ActiveCfg = Release|Any CPU {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|x86.Build.0 = Release|Any CPU - {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Debug|x64.ActiveCfg = Debug|Any CPU - {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Debug|x64.Build.0 = Debug|Any CPU - {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Debug|x86.ActiveCfg = Debug|Any CPU - {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Debug|x86.Build.0 = Debug|Any CPU - {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Release|Any CPU.Build.0 = Release|Any CPU - {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Release|x64.ActiveCfg = Release|Any CPU - {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Release|x64.Build.0 = Release|Any CPU - {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Release|x86.ActiveCfg = Release|Any CPU - {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Release|x86.Build.0 = Release|Any CPU - {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Debug|x64.ActiveCfg = Debug|Any CPU - {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Debug|x64.Build.0 = Debug|Any CPU - {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Debug|x86.ActiveCfg = Debug|Any CPU - {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Debug|x86.Build.0 = Debug|Any CPU - {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Release|Any CPU.Build.0 = Release|Any CPU - {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Release|x64.ActiveCfg = Release|Any CPU - {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Release|x64.Build.0 = Release|Any CPU - {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Release|x86.ActiveCfg = Release|Any CPU - {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Release|x86.Build.0 = Release|Any CPU - {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Debug|x64.ActiveCfg = Debug|Any CPU - {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Debug|x64.Build.0 = Debug|Any CPU - {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Debug|x86.ActiveCfg = Debug|Any CPU - {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Debug|x86.Build.0 = Debug|Any CPU - {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Release|Any CPU.Build.0 = Release|Any CPU - {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Release|x64.ActiveCfg = Release|Any CPU - {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Release|x64.Build.0 = Release|Any CPU - {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Release|x86.ActiveCfg = Release|Any CPU - {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Release|x86.Build.0 = Release|Any CPU - {A23E3408-D569-488E-A071-E1B3625C5F09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A23E3408-D569-488E-A071-E1B3625C5F09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A23E3408-D569-488E-A071-E1B3625C5F09}.Debug|x64.ActiveCfg = Debug|Any CPU - {A23E3408-D569-488E-A071-E1B3625C5F09}.Debug|x64.Build.0 = Debug|Any CPU - {A23E3408-D569-488E-A071-E1B3625C5F09}.Debug|x86.ActiveCfg = Debug|Any CPU - {A23E3408-D569-488E-A071-E1B3625C5F09}.Debug|x86.Build.0 = Debug|Any CPU - {A23E3408-D569-488E-A071-E1B3625C5F09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A23E3408-D569-488E-A071-E1B3625C5F09}.Release|Any CPU.Build.0 = Release|Any CPU - {A23E3408-D569-488E-A071-E1B3625C5F09}.Release|x64.ActiveCfg = Release|Any CPU - {A23E3408-D569-488E-A071-E1B3625C5F09}.Release|x64.Build.0 = Release|Any CPU - {A23E3408-D569-488E-A071-E1B3625C5F09}.Release|x86.ActiveCfg = Release|Any CPU - {A23E3408-D569-488E-A071-E1B3625C5F09}.Release|x86.Build.0 = Release|Any CPU - {57B182B8-9014-4C6D-B966-B464DE3127D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57B182B8-9014-4C6D-B966-B464DE3127D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57B182B8-9014-4C6D-B966-B464DE3127D5}.Debug|x64.ActiveCfg = Debug|Any CPU - {57B182B8-9014-4C6D-B966-B464DE3127D5}.Debug|x64.Build.0 = Debug|Any CPU - {57B182B8-9014-4C6D-B966-B464DE3127D5}.Debug|x86.ActiveCfg = Debug|Any CPU - {57B182B8-9014-4C6D-B966-B464DE3127D5}.Debug|x86.Build.0 = Debug|Any CPU - {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|Any CPU.Build.0 = Release|Any CPU - {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|x64.ActiveCfg = Release|Any CPU - {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|x64.Build.0 = Release|Any CPU - {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|x86.ActiveCfg = Release|Any CPU - {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|x86.Build.0 = Release|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|x64.ActiveCfg = Release|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|x64.Build.0 = Release|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|x86.ActiveCfg = Release|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|x86.Build.0 = Release|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Release|Any CPU.Build.0 = Release|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Release|x64.ActiveCfg = Release|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Release|x64.Build.0 = Release|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Release|x86.ActiveCfg = Release|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Release|x86.Build.0 = Release|Any CPU {97DD9467-B011-4736-AAC4-2C21BF554349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {97DD9467-B011-4736-AAC4-2C21BF554349}.Debug|Any CPU.Build.0 = Debug|Any CPU {97DD9467-B011-4736-AAC4-2C21BF554349}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -719,30 +635,6 @@ Global {FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Release|x64.Build.0 = Release|Any CPU {FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Release|x86.ActiveCfg = Release|Any CPU {FF80D706-8309-4E02-BAC0-D28B4CBCF600}.Release|x86.Build.0 = Release|Any CPU - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}.Debug|x64.ActiveCfg = Debug|Any CPU - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}.Debug|x64.Build.0 = Debug|Any CPU - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}.Debug|x86.ActiveCfg = Debug|Any CPU - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}.Debug|x86.Build.0 = Debug|Any CPU - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}.Release|Any CPU.Build.0 = Release|Any CPU - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}.Release|x64.ActiveCfg = Release|Any CPU - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}.Release|x64.Build.0 = Release|Any CPU - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}.Release|x86.ActiveCfg = Release|Any CPU - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC}.Release|x86.Build.0 = Release|Any CPU - {40A8D686-5DD4-4591-9194-DA236577AB0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40A8D686-5DD4-4591-9194-DA236577AB0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40A8D686-5DD4-4591-9194-DA236577AB0C}.Debug|x64.ActiveCfg = Debug|Any CPU - {40A8D686-5DD4-4591-9194-DA236577AB0C}.Debug|x64.Build.0 = Debug|Any CPU - {40A8D686-5DD4-4591-9194-DA236577AB0C}.Debug|x86.ActiveCfg = Debug|Any CPU - {40A8D686-5DD4-4591-9194-DA236577AB0C}.Debug|x86.Build.0 = Debug|Any CPU - {40A8D686-5DD4-4591-9194-DA236577AB0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40A8D686-5DD4-4591-9194-DA236577AB0C}.Release|Any CPU.Build.0 = Release|Any CPU - {40A8D686-5DD4-4591-9194-DA236577AB0C}.Release|x64.ActiveCfg = Release|Any CPU - {40A8D686-5DD4-4591-9194-DA236577AB0C}.Release|x64.Build.0 = Release|Any CPU - {40A8D686-5DD4-4591-9194-DA236577AB0C}.Release|x86.ActiveCfg = Release|Any CPU - {40A8D686-5DD4-4591-9194-DA236577AB0C}.Release|x86.Build.0 = Release|Any CPU {E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU {E141A226-CC0A-4F26-BD17-4AE427D81C3B}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -827,18 +719,6 @@ Global {488675EC-C8BB-40E0-AD4F-91F623D548B3}.Release|x64.Build.0 = Release|Any CPU {488675EC-C8BB-40E0-AD4F-91F623D548B3}.Release|x86.ActiveCfg = Release|Any CPU {488675EC-C8BB-40E0-AD4F-91F623D548B3}.Release|x86.Build.0 = Release|Any CPU - {6B2B841C-CCFF-469A-9939-EB07EA0401AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B2B841C-CCFF-469A-9939-EB07EA0401AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B2B841C-CCFF-469A-9939-EB07EA0401AE}.Debug|x64.ActiveCfg = Debug|Any CPU - {6B2B841C-CCFF-469A-9939-EB07EA0401AE}.Debug|x64.Build.0 = Debug|Any CPU - {6B2B841C-CCFF-469A-9939-EB07EA0401AE}.Debug|x86.ActiveCfg = Debug|Any CPU - {6B2B841C-CCFF-469A-9939-EB07EA0401AE}.Debug|x86.Build.0 = Debug|Any CPU - {6B2B841C-CCFF-469A-9939-EB07EA0401AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B2B841C-CCFF-469A-9939-EB07EA0401AE}.Release|Any CPU.Build.0 = Release|Any CPU - {6B2B841C-CCFF-469A-9939-EB07EA0401AE}.Release|x64.ActiveCfg = Release|Any CPU - {6B2B841C-CCFF-469A-9939-EB07EA0401AE}.Release|x64.Build.0 = Release|Any CPU - {6B2B841C-CCFF-469A-9939-EB07EA0401AE}.Release|x86.ActiveCfg = Release|Any CPU - {6B2B841C-CCFF-469A-9939-EB07EA0401AE}.Release|x86.Build.0 = Release|Any CPU {DFF82C76-9498-4E8B-8B5E-D12E2B92FA46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DFF82C76-9498-4E8B-8B5E-D12E2B92FA46}.Debug|Any CPU.Build.0 = Debug|Any CPU {DFF82C76-9498-4E8B-8B5E-D12E2B92FA46}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -930,12 +810,6 @@ Global {107F28E1-6E91-4A06-8943-E5E5A7E4CA66} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999} {D27E1CB4-C641-4C6C-A140-EF5F6215AE29} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} - {22C2F754-11A1-435A-9F64-645CD4C1C31A} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} - {B619F69F-6864-4A6E-894A-C02E5FB0128F} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} - {D68733FF-7520-4906-AE35-B7B9DBAC543F} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} - {A23E3408-D569-488E-A071-E1B3625C5F09} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} - {57B182B8-9014-4C6D-B966-B464DE3127D5} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} {97DD9467-B011-4736-AAC4-2C21BF554349} = {B9AB7A3D-4F63-48D2-86C0-70F52F6509AB} {EFA38DEF-C2BB-42AE-8B68-B31D79F3107E} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} {0D85D957-6FF2-4620-B766-B708801D97F3} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} @@ -944,9 +818,7 @@ Global {CAE652AF-6801-425E-AAF3-AB20DE7DF88E} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3} {FF80D706-8309-4E02-BAC0-D28B4CBCF600} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} - {CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} {DED1590A-ED25-413B-8590-006A4DD5B2FD} = {EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330} - {40A8D686-5DD4-4591-9194-DA236577AB0C} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} {E141A226-CC0A-4F26-BD17-4AE427D81C3B} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29} {376C19DE-31E2-4FF6-88FC-0D0D6233C999} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} {3E698655-0701-482E-9AA7-F956F6337FC7} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999} @@ -955,13 +827,13 @@ Global {11ECCB8B-6958-42A7-BD58-88C09CB149B2} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} {76D4BB7E-D981-42D5-BE96-6FAD8DEF9A4A} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} {488675EC-C8BB-40E0-AD4F-91F623D548B3} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} - {6B2B841C-CCFF-469A-9939-EB07EA0401AE} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} {DFF82C76-9498-4E8B-8B5E-D12E2B92FA46} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} {B705537C-B82C-4A30-AFA5-6244D9A7DAEB} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} {65A25D6E-C9CC-4F45-8925-04087AC82634} = {B705537C-B82C-4A30-AFA5-6244D9A7DAEB} {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} + {0D4DF78D-7E5F-4516-B19F-E6AA71A1DBF4} = {EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0541B30C-FF51-4E28-B172-83F5F3934BCD} diff --git a/scripts/build.ps1 b/scripts/build.ps1 index aac23ade15..c5cb61d162 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -71,6 +71,7 @@ $env:MSBUILD_VERSION = "15.0" # Write-Verbose "Setup build configuration." $TPB_Solution = "TestPlatform.sln" +$TPB_TestAssets_Solution = Join-Path $env:TP_ROOT_DIR "test\TestAssets\TestAssets.sln" $TPB_TargetFramework = "net451" $TPB_TargetFrameworkCore = "netcoreapp1.0" $TPB_TargetFrameworkCore20 = "netcoreapp2.0" @@ -187,6 +188,11 @@ function Invoke-Build & $dotnetExe build $TPB_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild Write-Log ".. .. Build: Complete." + Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution" + Write-Verbose "$dotnetExe build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild" + & $dotnetExe build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild + Write-Log ".. .. Build: Complete." + if ($lastExitCode -ne 0) { Set-ScriptFailed } diff --git a/scripts/perf/perf.ps1 b/scripts/perf/perf.ps1 index 068cff3445..566758417c 100644 --- a/scripts/perf/perf.ps1 +++ b/scripts/perf/perf.ps1 @@ -210,7 +210,7 @@ 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.Goal = $payload.discoverygoal[$payload.runners.IndexOf("`"$($payload.currentRunner)`"")] Set-CommonProperties $result $payload $Script:TPT_Results.Add($result) > $null } @@ -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 } @@ -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") { @@ -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 } @@ -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 \ No newline at end of file diff --git a/test/TestAssets/TestAssets.sln/TestAssets.sln b/test/TestAssets/TestAssets.sln/TestAssets.sln new file mode 100644 index 0000000000..fa2d5a93f6 --- /dev/null +++ b/test/TestAssets/TestAssets.sln/TestAssets.sln @@ -0,0 +1,97 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26913.4001 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnitAdapterPerfTestProject", "..\NUnitAdapterPerfTestProject\NUnitAdapterPerfTestProject.csproj", "{F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnitAdapterPerfTestProject", "..\XUnitAdapterPerfTestProject\XUnitAdapterPerfTestProject.csproj", "{C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTestAdapterPerfTestProject", "..\MSTestAdapterPerfTestProject\MSTestAdapterPerfTestProject.csproj", "{52CAF89F-2309-4597-B531-79D6A96902BE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUTestProject", "..\NUTestProject\NUTestProject.csproj", "{1ADE5795-2365-4790-8ACB-2EF0C2613D61}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlameUnitTestProject", "..\BlameUnitTestProject\BlameUnitTestProject.csproj", "{29294E06-3998-4FF4-910F-EE93A915C3A1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUPerfTestProject", "..\XUPerfTestProject\XUPerfTestProject.csproj", "{530FD85F-0222-4078-9610-4AC1C8A5E294}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUTestProject", "..\XUTestProject\XUTestProject.csproj", "{C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProject", "..\SimpleTestProject\SimpleTestProject.csproj", "{7E79BDC2-49BA-403A-BE07-212C463A279B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleDataCollector", "..\SimpleDataCollector\SimpleDataCollector.csproj", "{E0042DCD-0C90-4736-B673-BC6CBDA04834}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProject2", "..\SimpleTestProject2\SimpleTestProject2.csproj", "{2B0F911C-5864-4EF7-A1F4-6923F7963D74}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcDataCollector", "..\OutOfProcDataCollector\OutOfProcDataCollector.csproj", "{1266AB9D-94D9-496D-8AE5-73612D097A09}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerfTestProject", "..\PerfTestProject\PerfTestProject.csproj", "{1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleRunners", "..\ConsoleRunners\ConsoleRunners.csproj", "{FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F22A8D65-0581-4CC7-9C1C-9BC9F9E80DA4}.Release|Any CPU.Build.0 = Release|Any CPU + {C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C1A621CF-8FA8-437C-98E8-C6C6418FEBEF}.Release|Any CPU.Build.0 = Release|Any CPU + {52CAF89F-2309-4597-B531-79D6A96902BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {52CAF89F-2309-4597-B531-79D6A96902BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {52CAF89F-2309-4597-B531-79D6A96902BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {52CAF89F-2309-4597-B531-79D6A96902BE}.Release|Any CPU.Build.0 = Release|Any CPU + {1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1ADE5795-2365-4790-8ACB-2EF0C2613D61}.Release|Any CPU.Build.0 = Release|Any CPU + {29294E06-3998-4FF4-910F-EE93A915C3A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {29294E06-3998-4FF4-910F-EE93A915C3A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {29294E06-3998-4FF4-910F-EE93A915C3A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {29294E06-3998-4FF4-910F-EE93A915C3A1}.Release|Any CPU.Build.0 = Release|Any CPU + {530FD85F-0222-4078-9610-4AC1C8A5E294}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {530FD85F-0222-4078-9610-4AC1C8A5E294}.Debug|Any CPU.Build.0 = Debug|Any CPU + {530FD85F-0222-4078-9610-4AC1C8A5E294}.Release|Any CPU.ActiveCfg = Release|Any CPU + {530FD85F-0222-4078-9610-4AC1C8A5E294}.Release|Any CPU.Build.0 = Release|Any CPU + {C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8AB532E-28E9-4C5E-9F2D-06B6690FCB72}.Release|Any CPU.Build.0 = Release|Any CPU + {7E79BDC2-49BA-403A-BE07-212C463A279B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7E79BDC2-49BA-403A-BE07-212C463A279B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7E79BDC2-49BA-403A-BE07-212C463A279B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7E79BDC2-49BA-403A-BE07-212C463A279B}.Release|Any CPU.Build.0 = Release|Any CPU + {E0042DCD-0C90-4736-B673-BC6CBDA04834}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E0042DCD-0C90-4736-B673-BC6CBDA04834}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E0042DCD-0C90-4736-B673-BC6CBDA04834}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E0042DCD-0C90-4736-B673-BC6CBDA04834}.Release|Any CPU.Build.0 = Release|Any CPU + {2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2B0F911C-5864-4EF7-A1F4-6923F7963D74}.Release|Any CPU.Build.0 = Release|Any CPU + {1266AB9D-94D9-496D-8AE5-73612D097A09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1266AB9D-94D9-496D-8AE5-73612D097A09}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1266AB9D-94D9-496D-8AE5-73612D097A09}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1266AB9D-94D9-496D-8AE5-73612D097A09}.Release|Any CPU.Build.0 = Release|Any CPU + {1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1D1FDCD9-10B5-4C54-8A95-AD0C941F41C6}.Release|Any CPU.Build.0 = Release|Any CPU + {FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FBDB7A61-C1DB-4B24-B568-DA96AAD0DB8A}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D2334DAA-F7B2-450E-ABA4-FBC185152500} + EndGlobalSection +EndGlobal