Skip to content

[tests] Skip XslCompiledTransformApi tests on iOS, tvOS, and when testing native AOT #75730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 23, 2022
Merged

[tests] Skip XslCompiledTransformApi tests on iOS, tvOS, and when testing native AOT #75730

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1901bd3
Skip XslCompiledTransformApi tests on iOS, tvOS, and when testing nat…
mdh1418 Sep 15, 2022
3504d48
Condition each XslCompiledTransformApi test class on IsReflectionEmit…
mdh1418 Sep 16, 2022
835d515
[tests] Condition XmlSerializerTests on ReflectionEmit
mdh1418 Sep 19, 2022
103d596
[tests] Condition problematic XmlSchemaValidatorApiTests classes on R…
mdh1418 Sep 21, 2022
92ec601
Revert "[tests] Condition problematic XmlSchemaValidatorApiTests clas…
jkotas Sep 23, 2022
600459c
Revert "[tests] Condition XmlSerializerTests on ReflectionEmit"
jkotas Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,8 @@
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<ItemGroup Condition="(('$(TargetOS)' != 'tvOS' and '$(TargetOS)' != 'iOS') or '$(RunDisablediOSTests)' == 'true') and
('$(TestNativeAot)' != 'true' or '$(RunDisabledNativeAotTests)' == 'true')" >
Copy link
Member

@MichalStrehovsky MichalStrehovsky Sep 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be better to put [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsReflectionEmitSupported))] on the individual test classes in these files. It's more consistent with how we do things and more futureproof.

<Compile Include="Xslt\XslCompiledTransformApi\Errata4.cs" />
<Compile Include="Xslt\XslCompiledTransformApi\OutputSettings.cs" />
<Compile Include="Xslt\XslCompiledTransformApi\TempFiles.cs" />
Expand All @@ -632,6 +633,9 @@
<Compile Include="Xslt\XslCompiledTransformApi\XslTransformMultith.cs" />
<Compile Include="Xslt\XslCompiledTransformApi\XsltSettings.cs" />
<Compile Include="Xslt\XslCompiledTransformApi\XslCompiledTransform.cs" />
</ItemGroup>

<ItemGroup>
<Compile Include="Xslt\XslTransformApi\CXslTArgumentList.cs" />
<Compile Include="Xslt\XslTransformApi\CXsltArgumentListMultith.cs" />
<Compile Include="Xslt\XslTransformApi\CXslTransform.cs" />
Expand Down
8 changes: 0 additions & 8 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,6 @@
<ItemGroup Condition="'$(TargetOS)' == 'iOS' and '$(RunDisablediOSTests)' != 'true'">
<ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj" />

<!-- Ref.Emit in XSLCompiledTransform -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Xml\tests\Xslt\XslCompiledTransformApi\System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj" />

<!-- Functional tests on devices have problems with return codes from mlaunch -->
<ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\$(TargetOS)\Device\**\*.Test.csproj" />
</ItemGroup>
Expand All @@ -258,8 +255,6 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'tvOS' and '$(RunDisablediOSTests)' != 'true'">
<!-- Ref.Emit in XSLCompiledTransform -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Xml\tests\Xslt\XslCompiledTransformApi\System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection\tests\System.Reflection.Emit.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.csproj" />
Expand Down Expand Up @@ -494,9 +489,6 @@
<!-- More than two thirds of tests failing due to ref emit -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\tests\DI.Tests\Microsoft.Extensions.DependencyInjection.Tests.csproj" />

<!-- Xslt is ref.emit -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Xml\tests\Xslt\XslCompiledTransformApi\System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj" />

<!-- These are failing in localized runs due to satellite assembly reflection in the test. Work fine otherwise. -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Xml\tests\XmlSchema\XmlSchemaValidatorApi\System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj"
Condition="'$(TargetOS)' == 'windows'"/>
Expand Down