From b7ebfce745b4723c78267ca04e2d1000d12c9879 Mon Sep 17 00:00:00 2001 From: Simon Rozsival Date: Wed, 16 Jul 2025 12:24:06 +0200 Subject: [PATCH 1/3] Enable test LargeHeaders_TrickledOverTime_ProcessedEfficiently on 64-bit Android --- .../tests/FunctionalTests/SocketsHttpHandlerTest.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs index 2577094cb52b4e..a77b6cba2019aa 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs @@ -1702,11 +1702,16 @@ from lineFolds in BoolValues private delegate int StreamReadSpanDelegate(Span buffer); - [Theory] + [ConditionalTheory] [MemberData(nameof(TripleBoolValues))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/77474", TestPlatforms.Android)] public async Task LargeHeaders_TrickledOverTime_ProcessedEfficiently(bool trailingHeaders, bool async, bool lineFolds) { + if (PlatformDetection.IsAndroid && !(PlatformDetection.IsArm64Process || PlatformDetection.IsX64Process)) + { + // https://github.com/dotnet/runtime/issues/77474 + throw new SkipTestException("This test is runs out of memory on 32-bit Android devices"); + } + Memory responsePrefix = Encoding.ASCII.GetBytes(trailingHeaders ? "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n0\r\nLong-Header: " : "HTTP/1.1 200 OK\r\nContent-Length: 0\r\nLong-Header: "); From 11f9a09f376e4cf1d73c71ee6e68614368faf697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Rozs=C3=ADval?= Date: Wed, 16 Jul 2025 12:27:52 +0200 Subject: [PATCH 2/3] Update src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../tests/FunctionalTests/SocketsHttpHandlerTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs index a77b6cba2019aa..ef2e1a85e149c5 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs @@ -1709,7 +1709,7 @@ public async Task LargeHeaders_TrickledOverTime_ProcessedEfficiently(bool traili if (PlatformDetection.IsAndroid && !(PlatformDetection.IsArm64Process || PlatformDetection.IsX64Process)) { // https://github.com/dotnet/runtime/issues/77474 - throw new SkipTestException("This test is runs out of memory on 32-bit Android devices"); + throw new SkipTestException("This test runs out of memory on 32-bit Android devices"); } Memory responsePrefix = Encoding.ASCII.GetBytes(trailingHeaders From f45fe72962c33b65ae2bc84393a6234803f64473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Rozs=C3=ADval?= Date: Wed, 16 Jul 2025 23:07:26 +0200 Subject: [PATCH 3/3] Update src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexander Köplinger --- .../tests/FunctionalTests/SocketsHttpHandlerTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs index ef2e1a85e149c5..e375da42d5af8b 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs @@ -1706,7 +1706,7 @@ from lineFolds in BoolValues [MemberData(nameof(TripleBoolValues))] public async Task LargeHeaders_TrickledOverTime_ProcessedEfficiently(bool trailingHeaders, bool async, bool lineFolds) { - if (PlatformDetection.IsAndroid && !(PlatformDetection.IsArm64Process || PlatformDetection.IsX64Process)) + if (PlatformDetection.IsAndroid && PlatformDetection.Is32BitProcess) { // https://github.com/dotnet/runtime/issues/77474 throw new SkipTestException("This test runs out of memory on 32-bit Android devices");