Run just Android Arm64 System.Security.Cryptography.Pkcs.Tests (#56861)

* Run just Android Arm64 System.Security.Cryptography.Pkcs.Tests

* Revert "Run just Android Arm64 System.Security.Cryptography.Pkcs.Tests"

This reverts commit 2112f85c9abf4668b892ef21c0476df40a8f71be.

* [libraries][Android] Remove System.Security.Cryptography.Pkcs.Tests proj level skip

* Skip System.Security.Cryptography.Pkcs on CI for x64 x86 crash

* Reduce iteration count for Android due to high memory allocation

* Revert "Skip System.Security.Cryptography.Pkcs on CI for x64 x86 crash"

This reverts commit 294ea1519d3cdc62f441f55774d9f4cb9ba37d02.

* Add comment to explain change and use inline condition

Co-authored-by: Mitchell Hwang <mitchell.hwang@microsoft.com>

diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/Pkcs12/Pkcs12InfoTests.cs b/src/libraries/System.Security.Cryptography.Pkcs/tests/Pkcs12/Pkcs12InfoTests.cs
index cb0ad4e..d88ffb6 100644 (file)
--- a/src/libraries/System.Security.Cryptography.Pkcs/tests/Pkcs12/Pkcs12InfoTests.cs
+++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/Pkcs12/Pkcs12InfoTests.cs
@@ -290,10 +290,12 @@ namespace System.Security.Cryptography.Pkcs.Tests.Pkcs12
         {
             get
             {
-                yield return new object[] { PbeEncryptionAlgorithm.Aes128Cbc, HashAlgorithmName.SHA256, 700_000 };
-                yield return new object[] { PbeEncryptionAlgorithm.Aes192Cbc, HashAlgorithmName.SHA256, 700_000 };
-                yield return new object[] { PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 700_000 };
-                yield return new object[] { PbeEncryptionAlgorithm.TripleDes3KeyPkcs12, HashAlgorithmName.SHA1, 600_000 };
+                // On Android, the tests run out of memory when running DecodeWithHighPbeIterations and causes a crash in CI
+                // Instead of disabling the whole suite, we opted to reduce the number of iterations to help the tests pass
+                yield return new object[] { PbeEncryptionAlgorithm.Aes128Cbc, HashAlgorithmName.SHA256, OperatingSystem.IsAndroid() ? 7000 : 700_000 };
+                yield return new object[] { PbeEncryptionAlgorithm.Aes192Cbc, HashAlgorithmName.SHA256, OperatingSystem.IsAndroid() ? 7000 : 700_000 };
+                yield return new object[] { PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, OperatingSystem.IsAndroid() ? 7000 : 700_000 };
+                yield return new object[] { PbeEncryptionAlgorithm.TripleDes3KeyPkcs12, HashAlgorithmName.SHA1, OperatingSystem.IsAndroid() ? 6000 : 600_000 };
             }
         }
 

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index ca21cd0..082d384 100644 (file)
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -55,16 +55,10 @@
     <!-- Crash https://github.com/dotnet/runtime/issues/55823 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Experimental\tests\System.Runtime.Experimental.Tests.csproj" />
 
-    <!-- Crashes on x64 and x86, but not arm64 -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.Pkcs\tests\System.Security.Cryptography.Pkcs.Tests.csproj" />
-
     <!-- Actual test failures -->
     <!-- https://github.com/dotnet/runtime/issues/37088 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\System.Runtime.Tests.csproj" />
 
-    <!-- Runs an fails on arm64 https://github.com/dotnet/runtime/issues/37094 -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.Pkcs\tests\System.Security.Cryptography.Pkcs.Tests.csproj" />
-
     <!-- https://github.com/dotnet/runtime/issues/50871 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\tests\DI.Tests\Microsoft.Extensions.DependencyInjection.Tests.csproj" />