diff options
| author | Steve Pfister <steveisok@users.noreply.github.com> | 2022-06-21 05:34:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-21 05:34:11 +0300 |
| commit | cb32ed3ab0a9bbb2dbfc69cb18ffdb3a7eb99986 (patch) | |
| tree | a1eb7d94a70097c8fcd281893233d793c1ed4688 /eng/testing | |
| parent | 30bf66a0ef5342ea229a52e2d5b377f3102948a4 (diff) | |
[Android] Make sure AdditionalTimeZoneChecks trait is added to xunit-excludes (#70974)
The trait is supposed to be included in System.Runtime tests by default, but wasn't because the _withoutCategories property was in tests.props. As a result, the property was resolved before the .csproj properties. This fix moves the property definition to tests.targets.
Fixes #70482
Diffstat (limited to 'eng/testing')
| -rw-r--r-- | eng/testing/tests.props | 12 | ||||
| -rw-r--r-- | eng/testing/tests.targets | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/eng/testing/tests.props b/eng/testing/tests.props index e91ec1bbcf0..7ed95b94326 100644 --- a/eng/testing/tests.props +++ b/eng/testing/tests.props @@ -10,18 +10,6 @@ <TestSingleFile Condition="'$(TestNativeAot)' == 'true'">true</TestSingleFile> </PropertyGroup> - <PropertyGroup> - <!-- Default and user defined categories --> - <_withCategories Condition="'$(WithCategories)' != ''">;$(WithCategories.Trim(';'))</_withCategories> - <_withoutCategories Condition="'$(WithoutCategories)' != ''">;$(WithoutCategories.Trim(';'))</_withoutCategories> - - <TestScope Condition="'$(TestScope)' == '' and '$(Outerloop)' == 'true'">all</TestScope> - <_withCategories Condition="'$(TestScope)' == 'outerloop'">$(_withCategories);OuterLoop</_withCategories> - <_withoutCategories Condition="'$(ArchiveTests)' == 'true'">$(_withoutCategories);IgnoreForCI</_withoutCategories> - <_withoutCategories Condition="'$(TestScope)' == '' or '$(TestScope)' == 'innerloop'">$(_withoutCategories);OuterLoop</_withoutCategories> - <_withoutCategories Condition="!$(_withCategories.Contains('failing'))">$(_withoutCategories);failing</_withoutCategories> - </PropertyGroup> - <PropertyGroup Condition="'$(TargetsMobile)' == 'true'"> <!-- Test runners are built as part of libs.pretest so we need to use libraries configuration --> <AppleTestRunnerDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleTestRunner', '$(Configuration)', '$(NetCoreAppCurrent)'))</AppleTestRunnerDir> diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets index df308f3182d..c358ff594f3 100644 --- a/eng/testing/tests.targets +++ b/eng/testing/tests.targets @@ -36,6 +36,18 @@ <RunScriptHost Condition="'$(RunScriptWindowsCmd)' != 'true'">$(RunScriptHostDir)dotnet</RunScriptHost> </PropertyGroup> + <PropertyGroup> + <!-- Default and user defined categories --> + <_withCategories Condition="'$(WithCategories)' != ''">;$(WithCategories.Trim(';'))</_withCategories> + <_withoutCategories Condition="'$(WithoutCategories)' != ''">;$(WithoutCategories.Trim(';'))</_withoutCategories> + + <TestScope Condition="'$(TestScope)' == '' and '$(Outerloop)' == 'true'">all</TestScope> + <_withCategories Condition="'$(TestScope)' == 'outerloop'">$(_withCategories);OuterLoop</_withCategories> + <_withoutCategories Condition="'$(ArchiveTests)' == 'true'">$(_withoutCategories);IgnoreForCI</_withoutCategories> + <_withoutCategories Condition="'$(TestScope)' == '' or '$(TestScope)' == 'innerloop'">$(_withoutCategories);OuterLoop</_withoutCategories> + <_withoutCategories Condition="!$(_withCategories.Contains('failing'))">$(_withoutCategories);failing</_withoutCategories> + </PropertyGroup> + <!-- For both tests.mobile.targets and tests.wasm.targets --> <PropertyGroup> <_MonoAotCrossCompilerPath>$([MSBuild]::NormalizePath($(MonoAotCrossDir), 'mono-aot-cross'))</_MonoAotCrossCompilerPath> |