diff options
| author | Eric Mellino <erme@microsoft.com> | 2017-04-14 15:05:13 +0300 |
|---|---|---|
| committer | Stephen Toub <stoub@microsoft.com> | 2017-04-14 15:05:13 +0300 |
| commit | aa32ba266008803174f784f2c2f5996f555c6bf7 (patch) | |
| tree | dd9aa5d90b50afe41840b0b81bf3fd58f0101cf2 /Tools-Override | |
| parent | 6317e53b89680d83747d789c354bb1acda011758 (diff) | |
Run one iteration of performance tests in Outerloop runs (#18243)
* Run one iteration of performance tests in Outerloop runs
This will give us extra assurance that the performance tests do not fail.
* Fix System.IO.Pipes.Performance.Tests configuration.
* Disable Pipes performance test on Unix, see issue 18290.
Diffstat (limited to 'Tools-Override')
| -rw-r--r-- | Tools-Override/tests.targets | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Tools-Override/tests.targets b/Tools-Override/tests.targets index 1229e47f30..d61bf1177b 100644 --- a/Tools-Override/tests.targets +++ b/Tools-Override/tests.targets @@ -51,7 +51,7 @@ <XunitOptions Condition="'$(BuildingNETFxVertical)' == 'true' and '$(XUnitNoAppdomain)' == 'true'">$(XunitOptions) -noappdomain </XunitOptions> <XunitOptions>$(XunitOptions) -xml $(XunitResultsFileName)</XunitOptions> - <XunitOptions Condition="'$(Performance)'!='true'">$(XunitOptions) -notrait Benchmark=true</XunitOptions> + <XunitOptions Condition="'$(Performance)'!='true' and '$(Outerloop)' != 'true'">$(XunitOptions) -notrait Benchmark=true</XunitOptions> <XunitOptions Condition="'$(BuildingUAPAOTVertical)'=='true'">$(XunitOptions) -redirectoutput</XunitOptions> <XunitOptions>$(XunitOptions) -notrait category=non$(_bc_TargetGroup)tests</XunitOptions> @@ -278,9 +278,13 @@ <ItemGroup Condition="'$(Performance)'!='true'"> <!-- On Windows, call prevents the test command from making execution end prematurely --> <TestCommandLines Condition="'$(TargetOS)'=='Windows_NT' and '$(TestGCStressLevel)' != ''" Include="set COMPlus_GCStress=$(TestGCStressLevel)"/> + <TestCommandLines Condition="'$(TargetOS)'=='Windows_NT' and '$(OuterLoop)' == 'true'" Include="set XUNIT_PERFORMANCE_MIN_ITERATION=1"/> + <TestCommandLines Condition="'$(TargetOS)'=='Windows_NT' and '$(OuterLoop)' == 'true'" Include="set XUNIT_PERFORMANCE_MAX_ITERATION=1"/> <TestCommandLines Condition="'$(TargetOS)'=='Windows_NT'" Include="call $(TestCommandLine)"/> <TestCommandLines Condition="'$(TargetOS)'!='Windows_NT' and '$(TestGCStressLevel)' != ''" Include="export COMPlus_GCStress=$(TestGCStressLevel)"/> + <TestCommandLines Condition="'$(TargetOS)'!='Windows_NT' and '$(OuterLoop)' == 'true'" Include="export XUNIT_PERFORMANCE_MIN_ITERATION=1"/> + <TestCommandLines Condition="'$(TargetOS)'!='Windows_NT' and '$(OuterLoop)' == 'true'" Include="export XUNIT_PERFORMANCE_MAX_ITERATION=1"/> <TestCommandLines Condition="'$(TargetOS)'!='Windows_NT'" Include="chmod +x $(TestProgram)"/> <TestCommandLines Condition="'$(TargetOS)'!='Windows_NT'" Include="$(TestCommandLine)"/> </ItemGroup> |