Skip to content

Commit a4a1864

Browse files
mdaiglemdaigle
committed
Don't collect code coverage for flaky tests.
1 parent c846ec8 commit a4a1864

2 files changed

Lines changed: 22 additions & 25 deletions

File tree

‎build.proj‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,15 @@
4343
<NugetPackProperties Condition="'$(TF_BUILD)' == 'true'">$(NugetPackProperties);ContinuousIntegrationBuild=true;</NugetPackProperties>
4444
</PropertyGroup>
4545

46+
<!-- Test configuration properties -->
47+
<PropertyGroup>
48+
<FilterStatement>$(Filter)</FilterStatement>
49+
<FilterStatement Condition="'$(FilterStatement)' == ''">category!=failing&amp;category!=flaky</FilterStatement>
50+
<!--Collect code coverage unless explicitly disabled-->
51+
<CollectCodeCoverage Condition="'$(CollectCodeCoverage)' == ''">true</CollectCodeCoverage>
52+
<CollectStatement Condition="'$(CollectCodeCoverage)' == 'true'">--collect "Code coverage"</CollectStatement>
53+
</PropertyGroup>
54+
4655
<!-- Release Build properties must be turned on for Release purposes, and turned off for Code Coverage calculations -->
4756
<PropertyGroup>
4857
<BuildForRelease Condition="$(BuildForRelease) == ''">true</BuildForRelease>
@@ -223,16 +232,14 @@
223232
<!-- Run all unit tests applicable to Windows. -->
224233
<Target Name="RunUnitTestsWindows" Condition="'$(IsEnabledWindows)' == 'true' AND $(ReferenceType.Contains('Project'))">
225234
<PropertyGroup>
226-
<FilterStatement>$(Filter)</FilterStatement>
227-
<FilterStatement Condition="'$(FilterStatement)' == ''">category!=failing&amp;category!=flaky</FilterStatement>
228235
<TestCommand>
229236
$(DotnetPath)dotnet test "@(UnitTestsProj)"
230237
--no-build
231238
-v n
232239
-p:Configuration=$(Configuration)
233240
-p:Target$(TFGroup)Version=$(TF)
234241
-p:TestTargetOS=Windows$(TargetGroup)
235-
--collect "Code coverage"
242+
$(CollectStatement)
236243
--results-directory $(ResultsDirectory)
237244
--filter "$(FilterStatement)"
238245
--logger:"trx;LogFilePrefix=Unit-Windows$(TargetGroup)-$(TestSet)"
@@ -246,20 +253,18 @@
246253
<!-- Run all unit tests applicable to Unix. -->
247254
<Target Name="RunUnitTestsUnix" Condition="'$(IsEnabledWindows)' != 'true' AND $(ReferenceType.Contains('Project'))">
248255
<PropertyGroup>
249-
<FilterStatement>$(Filter)</FilterStatement>
250-
<FilterStatement Condition="'$(FilterStatement)' == ''">category!=failing&amp;category!=flaky</FilterStatement>
251256
<TestCommand>
252257
$(DotnetPath)dotnet test "@(UnitTestsProj)"
253258
--no-build
254259
-v n
255260
-p:Configuration=$(Configuration)
256261
-p:TargetNetCoreVersion=$(TF)
257262
-p:TestTargetOS=Unixnetcoreapp
258-
--collect "Code coverage"
263+
$(CollectStatement)
259264
--results-directory $(ResultsDirectory)
260265
--filter "$(FilterStatement)"
261266
--logger:"trx;LogFilePrefix=Unit-Unixnetcoreapp-$(TestSet)"
262-
</TestCommand>
267+
</TestCommand>
263268
<TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>
264269
</PropertyGroup>
265270
<Message Text=">>> Running unit tests for Unix via command: $(TestCommand)"/>
@@ -272,8 +277,6 @@
272277
<!-- Run all Functional tests applicable to Windows. -->
273278
<Target Name="RunFunctionalTestsWindows" Condition="'$(IsEnabledWindows)' == 'true'">
274279
<PropertyGroup>
275-
<FilterStatement>$(Filter)</FilterStatement>
276-
<FilterStatement Condition="'$(FilterStatement)' == ''">category!=failing&amp;category!=flaky</FilterStatement>
277280
<TestCommand>
278281
$(DotnetPath)dotnet test "@(FunctionalTestsProj)"
279282
--no-build
@@ -283,7 +286,7 @@
283286
-p:ReferenceType=$(ReferenceType)
284287
-p:TestSet=$(TestSet)
285288
-p:TestTargetOS=Windows$(TargetGroup)
286-
--collect "Code coverage"
289+
$(CollectStatement)
287290
--results-directory $(ResultsDirectory)
288291
--filter "$(FilterStatement)"
289292
--logger:"trx;LogFilePrefix=Functional-Windows$(TargetGroup)-$(TestSet)"
@@ -297,8 +300,6 @@
297300
<!-- Run all Functional tests applicable to Unix. -->
298301
<Target Name="RunFunctionalTestsUnix" Condition="'$(IsEnabledWindows)' != 'true'">
299302
<PropertyGroup>
300-
<FilterStatement>$(Filter)</FilterStatement>
301-
<FilterStatement Condition="'$(FilterStatement)' == ''">category!=failing&amp;category!=flaky</FilterStatement>
302303
<TestCommand>
303304
$(DotnetPath)dotnet test "@(FunctionalTestsProj)"
304305
--no-build
@@ -308,7 +309,7 @@
308309
-p:ReferenceType=$(ReferenceType)
309310
-p:TestSet=$(TestSet)
310311
-p:TestTargetOS=Unixnetcoreapp
311-
--collect "Code coverage"
312+
$(CollectStatement)
312313
--results-directory $(ResultsDirectory)
313314
--filter "$(FilterStatement)"
314315
--logger:"trx;LogFilePrefix=Functional-Unixnetcoreapp-$(TestSet)"
@@ -325,8 +326,6 @@
325326
<!-- Run all Manual tests applicable to Windows. -->
326327
<Target Name="RunManualTestsWindows" Condition="'$(IsEnabledWindows)' == 'true'">
327328
<PropertyGroup>
328-
<FilterStatement>$(Filter)</FilterStatement>
329-
<FilterStatement Condition="'$(FilterStatement)' == ''">category!=failing&amp;category!=flaky</FilterStatement>
330329
<TestCommand>
331330
$(DotnetPath)dotnet test "@(ManualTestsProj)"
332331
--no-build
@@ -336,7 +335,7 @@
336335
-p:ReferenceType=$(ReferenceType)
337336
-p:TestSet=$(TestSet)
338337
-p:TestTargetOS=Windows$(TargetGroup)
339-
--collect "Code coverage"
338+
$(CollectStatement)
340339
--results-directory $(ResultsDirectory)
341340
--filter "$(FilterStatement)"
342341
--logger:"trx;LogFilePrefix=Manual-Windows$(TargetGroup)-$(TestSet)"
@@ -350,8 +349,6 @@
350349
<!-- Run all Manual tests applicable to Unix. -->
351350
<Target Name="RunManualTestsUnix" Condition="'$(IsEnabledWindows)' != 'true'">
352351
<PropertyGroup>
353-
<FilterStatement>$(Filter)</FilterStatement>
354-
<FilterStatement Condition="'$(FilterStatement)' == ''">category!=failing&amp;category!=flaky</FilterStatement>
355352
<TestCommand>
356353
$(DotnetPath)dotnet test "@(ManualTestsProj)"
357354
--no-build
@@ -361,7 +358,7 @@
361358
-p:ReferenceType=$(ReferenceType)
362359
-p:TestSet=$(TestSet)
363360
-p:TestTargetOS=Unixnetcoreapp
364-
--collect "Code coverage"
361+
$(CollectStatement)
365362
--results-directory $(ResultsDirectory)
366363
--filter "$(FilterStatement)"
367364
--logger:"trx;LogFilePrefix=Manual-Unixnetcoreapp-$(TestSet)"

‎eng/pipelines/common/templates/steps/run-all-tests-step.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ steps:
8080
platform: '${{parameters.platform }}'
8181
configuration: '${{parameters.buildConfiguration }}'
8282
${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
83-
msbuildArguments: '-t:RunUnitTests -p:TF=${{parameters.targetFramework }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:Filter="category=flaky"'
83+
msbuildArguments: '-t:RunUnitTests -p:TF=${{parameters.targetFramework }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:Filter="category=flaky" -p:CollectCodeCoverage=false'
8484
${{ else }}: # x86
85-
msbuildArguments: '-t:RunUnitTests -p:TF=${{parameters.targetFramework }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }} -p:Filter="category=flaky"'
85+
msbuildArguments: '-t:RunUnitTests -p:TF=${{parameters.targetFramework }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }} -p:Filter="category=flaky" -p:CollectCodeCoverage=false'
8686
continueOnError: true
8787

8888
- task: MSBuild@1
@@ -105,9 +105,9 @@ steps:
105105
platform: '${{parameters.platform }}'
106106
configuration: '${{parameters.buildConfiguration }}'
107107
${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
108-
msbuildArguments: '-t:RunFunctionalTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:Filter="category=flaky"'
108+
msbuildArguments: '-t:RunFunctionalTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:Filter="category=flaky" -p:CollectCodeCoverage=false'
109109
${{ else }}: # x86
110-
msbuildArguments: '-t:RunFunctionalTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }} -p:Filter="category=flaky"'
110+
msbuildArguments: '-t:RunFunctionalTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }} -p:Filter="category=flaky" -p:CollectCodeCoverage=false'
111111
continueOnError: true
112112

113113
- task: MSBuild@1
@@ -131,9 +131,9 @@ steps:
131131
platform: '${{parameters.platform }}'
132132
configuration: '${{parameters.buildConfiguration }}'
133133
${{ if eq(parameters.msbuildArchitecture, 'x64') }}:
134-
msbuildArguments: '-t:RunManualTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:Filter="category=flaky"'
134+
msbuildArguments: '-t:RunManualTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:Filter="category=flaky" -p:CollectCodeCoverage=false'
135135
${{ else }}: # x86
136-
msbuildArguments: '-t:RunManualTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }} -p:Filter="category=flaky"'
136+
msbuildArguments: '-t:RunManualTests -p:TF=${{parameters.targetFramework }} -p:TestSet=${{parameters.testSet }} -p:ReferenceType=${{parameters.referenceType }} -p:TestMicrosoftDataSqlClientVersion=${{parameters.nugetPackageVersion }} -p:DotnetPath=${{parameters.dotnetx86RootPath }} -p:Filter="category=flaky" -p:CollectCodeCoverage=false'
137137
continueOnError: true
138138
retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
139139

0 commit comments

Comments
 (0)