Use remote executor for tests using appcontext

dotnet · Nov 28, 2024 · 41d7467 · 41d7467
1 parent d96f35a
commit 41d7467
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/src/libraries/System.Linq/src/System/Linq/Select.cs b/src/libraries/System.Linq/src/System/Linq/Select.cs
@@ -60,7 +60,7 @@ private static IEnumerable<TResult> SelectImplementation<TSource, TResult>(Func<
             // for value types. We don't do the same for reference types because reference type
             // expansion can happen lazily at runtime and the AOT compiler does postpone it (we
             // don't need more code, just more data structures describing the new types).
-            if (/*ValueTypeTrimFriendlySelect &&*/ typeof(TResult).IsValueType)
+            if (ValueTypeTrimFriendlySelect && typeof(TResult).IsValueType)
             {
 #if OPTIMIZE_FOR_SIZE
                 return new IEnumerableSelectIterator<TSource, TResult>(iterator, selector);

diff --git a/src/libraries/System.Linq/tests/SkipWhileTests.cs b/src/libraries/System.Linq/tests/SkipWhileTests.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
+using Microsoft.DotNet.RemoteExecutor;
 using Xunit;
 
 namespace System.Linq.Tests
@@ -62,14 +63,33 @@ public void RunOnce()
             Assert.Equal(Enumerable.Range(10, 10), Enumerable.Range(0, 20).RunOnce().SkipWhile((i, idx) => idx < 10));
         }
 
-        [Fact]
-        public void SkipErrorWhenSourceErrors()
+        [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
+        public static void SkipErrorWhenSourceErrors_TrimFriendlySelectTrue()
         {
-            var source = NumberRangeGuaranteedNotCollectionType(-2, 5).Select(i => (decimal)i).Select(m => 1 / m).Skip(4);
-            using(var en = source.GetEnumerator())
+            RemoteExecutor.Invoke(() =>
             {
-                Assert.Throws<DivideByZeroException>(() => en.MoveNext());
-            }
+                AppContext.SetSwitch("System.Linq.Enumerable.ValueTypeTrimFriendlySelect", true);
+
+                var source = NumberRangeGuaranteedNotCollectionType(-2, 5).Select(i => (decimal)i).Select(m => 1 / m).Skip(4);
+                var valuesFromEnumerable = source.ToList();
+                List<decimal> expectedValues = [(decimal)1/2];
+                Assert.Equal(expectedValues, valuesFromEnumerable);
+            }).Dispose();
+        }
+
+        [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
+        public void SkipErrorWhenSourceErrors_TrimFriendlySelectFalse()
+        {
+            RemoteExecutor.Invoke(() =>
+            {
+                AppContext.SetSwitch("System.Linq.Enumerable.ValueTypeTrimFriendlySelect", false);
+
+                var source = NumberRangeGuaranteedNotCollectionType(-2, 5).Select(i => (decimal)i).Select(m => 1 / m).Skip(4);
+                using (var en = source.GetEnumerator())
+                {
+                    Assert.Throws<DivideByZeroException>(() => en.MoveNext());
+                }
+            }).Dispose();
         }
 
         [Fact]

diff --git a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'browser'">true</DebuggerSupport>
   </PropertyGroup>