Re-enable some tests, and respect IlcDefaultStackSize on Windows

- Re-enable disabled tests tracked by dotnet#1417 and dotnet#2084 - Make stack size configurable on NAOT via `IlcDefaultStackSize` on Windows
hamarb123 · Feb 6, 2024 · 8ca1c96 · 8ca1c96
1 parent ace1720
commit 8ca1c96
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets
@@ -94,7 +94,8 @@ The .NET Foundation licenses this file to you under the MIT license.
       <LinkerArg Condition="'$(OutputType)' == 'WinExe' or '$(OutputType)' == 'Exe'" Include="/ENTRY:$(EntryPointSymbol) /NOEXP /NOIMPLIB" />
       <LinkerArg Include="/NATVIS:&quot;$(MSBuildThisFileDirectory)NativeAOT.natvis&quot;" />
       <LinkerArg Condition="'$(ControlFlowGuard)' == 'Guard'" Include="/guard:cf" />
-      <LinkerArg Condition="'$(OutputType)' == 'WinExe' or '$(OutputType)' == 'Exe'" Include="/STACK:0x180000" />
+      <LinkerArg Condition="('$(OutputType)' == 'WinExe' or '$(OutputType)' == 'Exe') and '$(IlcDefaultStackSize)' == ''" Include="/STACK:0x180000" />
+      <LinkerArg Condition="('$(OutputType)' == 'WinExe' or '$(OutputType)' == 'Exe') and '$(IlcDefaultStackSize)' != ''" Include="/STACK:$(IlcDefaultStackSize)" />
     </ItemGroup>
 
     <ItemGroup Condition="!Exists('$(IlcSdkPath)debugucrt.txt')">

diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs b/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs
@@ -4475,7 +4475,6 @@ public static void DCS_TypeWithPrimitiveKnownTypes()
         Assert.NotNull(actual);
     }
 
-    [ActiveIssue("https://github.com/dotnet/runtime/issues/1417", TestPlatforms.OSX)]
     [SkipOnPlatform(TestPlatforms.Browser, "Causes a stack overflow")]
     [Fact]
     public static void DCS_DeeplyLinkedData()

diff --git a/...libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWithTests.cs b/...libraries/System.Runtime/tests/System.Threading.Tasks.Tests/Task/TaskContinueWithTests.cs
@@ -1223,7 +1223,6 @@ public static void RunLazyCancellationTests_Negative()
         }
 
         [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/2084", TestRuntimes.Mono)]
         public static void LongContinuationChain_ContinueWith_DoesNotStackOverflow()
         {
             const int DiveDepth = 12_000;
-Original file line number
+Diff line change
@@ Expand Up / @@ -1223,7 +1223,6 @@ public static void RunLazyCancellationTests_Negative() @@
             }
             [Fact]
-            [ActiveIssue("https://github.com/dotnet/runtime/issues/2084", TestRuntimes.Mono)]
             public static void LongContinuationChain_ContinueWith_DoesNotStackOverflow()
             {
                 const int DiveDepth = 12_000;
@@ Expand Down @@