Skip to content

Commit 76552e0

Browse files
committed
fixup! Run only quarantined tests in outer loop
1 parent a011ac4 commit 76552e0

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

eng/Testing.props

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
<Project>
2-
<PropertyGroup Condition="'$(RunQuarantinedTests)' == 'true'">
3-
<ArtifactsLogDir>$(ArtifactsDir)log\$(Configuration)\Quarantined\</ArtifactsLogDir>
4-
<ArtifactsTestResultsDir>$(ArtifactsDir)TestResults\$(Configuration)\Quarantined\</ArtifactsTestResultsDir>
5-
<TestRunnerAdditionalArguments></TestRunnerAdditionalArguments>
6-
</PropertyGroup>
7-
82
<PropertyGroup Condition="'$(UseVSTestRunner)' != 'true'">
93
<_QuarantinedTestRunAdditionalArgs>-trait "Quarantined=true"</_QuarantinedTestRunAdditionalArgs>
104
<_NonQuarantinedTestRunAdditionalArgs>-notrait "Quarantined=true"</_NonQuarantinedTestRunAdditionalArgs>
@@ -16,7 +10,7 @@
1610
</PropertyGroup>
1711

1812
<PropertyGroup>
19-
<TestRunnerAdditionalArguments Condition="'$(RunQuarantinedTests)' == ''">$(_NonQuarantinedTestRunAdditionalArgs) $(TestRunnerAdditionalArguments)</TestRunnerAdditionalArguments>
20-
<TestRunnerAdditionalArguments Condition="'$(RunQuarantinedTests)' == 'true'">$(_QuarantinedTestRunAdditionalArgs) $(TestRunnerAdditionalArguments)</TestRunnerAdditionalArguments>
13+
<TestRunnerAdditionalArguments Condition="'$(RunQuarantinedTests)' == ''">$(TestRunnerAdditionalArguments) $(_NonQuarantinedTestRunAdditionalArgs) $(TestRunnerAdditionalArguments)</TestRunnerAdditionalArguments>
14+
<TestRunnerAdditionalArguments Condition="'$(RunQuarantinedTests)' == 'true'">$(TestRunnerAdditionalArguments) $(_QuarantinedTestRunAdditionalArgs) $(TestRunnerAdditionalArguments)</TestRunnerAdditionalArguments>
2115
</PropertyGroup>
2216
</Project>

eng/Testing.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<SkipTests Condition=" '$(IsHelix)' == 'true' and '$(RunTestsOnHelix)' == 'true' ">false</SkipTests>
1111

1212
<!-- Otherwise, run tests on AzDO CI agents -->
13-
<SkipTests Condition=" '$(RunTestsOnGithubActions)' != 'true' and '$(RunTestsOnHelix)' != 'true' ">true</SkipTests>
13+
<SkipTests Condition=" '$(RunTestsOnGithubActions)' != 'true' and '$(RunTestsOnHelix)' != 'true' ">false</SkipTests>
1414
</PropertyGroup>
1515
</Project>

0 commit comments

Comments
 (0)