From c710be17ed722172031981b855eb5980cec94d11 Mon Sep 17 00:00:00 2001 From: Tarek Mahmoud Sayed Date: Thu, 28 Jul 2022 16:04:08 -0700 Subject: [PATCH 1/3] Diable NJulianRuleTest on Android --- .../System.Runtime/tests/System/TimeZoneInfoTests.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs b/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs index 1eab33c43e78ef..a0895b1ffced56 100644 --- a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs +++ b/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs @@ -2573,7 +2573,9 @@ public static void GetSystemTimeZones_AllTimeZonesHaveOffsetInValidRange() // 0x3E, 0x2C, 0x30, 0x2F, 0x30, 0x2C, 0x4A, 0x33, 0x36, 0x35, 0x2F, 0x32, 0x35, 0x0A }; - [ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))] + private static bool CanRunNJulianRuleTest => PlatformDetection.IsNotAndroid && RemoteExecutor.IsSupported; + + [ConditionalTheory(nameof(CanRunNJulianRuleTest))] [PlatformSpecific(TestPlatforms.AnyUnix)] [InlineData("<+00>0<+01>,0/0,J365/25", 1, 1, true)] [InlineData("<+00>0<+01>,30/0,J365/25", 31, 1, true)] From e8c60b39081070ac411521e4432e9be51af4bc49 Mon Sep 17 00:00:00 2001 From: Tarek Mahmoud Sayed Date: Thu, 28 Jul 2022 16:39:59 -0700 Subject: [PATCH 2/3] Add comment including the tracking issue --- src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs b/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs index a0895b1ffced56..73a68e1dc23bdf 100644 --- a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs +++ b/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs @@ -2573,6 +2573,7 @@ public static void GetSystemTimeZones_AllTimeZonesHaveOffsetInValidRange() // 0x3E, 0x2C, 0x30, 0x2F, 0x30, 0x2C, 0x4A, 0x33, 0x36, 0x35, 0x2F, 0x32, 0x35, 0x0A }; + // https://github.com/dotnet/runtime/issues/73031 is the tracking issue to investigate the test failure on Android. private static bool CanRunNJulianRuleTest => PlatformDetection.IsNotAndroid && RemoteExecutor.IsSupported; [ConditionalTheory(nameof(CanRunNJulianRuleTest))] From e4989fa2d908dec59625368acdb72528fc23a3e1 Mon Sep 17 00:00:00 2001 From: Tarek Mahmoud Sayed Date: Fri, 29 Jul 2022 09:15:24 -0700 Subject: [PATCH 3/3] Update src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs Co-authored-by: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> --- src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs b/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs index 73a68e1dc23bdf..d71d4d5b3b4f56 100644 --- a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs +++ b/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs @@ -2574,7 +2574,7 @@ public static void GetSystemTimeZones_AllTimeZonesHaveOffsetInValidRange() }; // https://github.com/dotnet/runtime/issues/73031 is the tracking issue to investigate the test failure on Android. - private static bool CanRunNJulianRuleTest => PlatformDetection.IsNotAndroid && RemoteExecutor.IsSupported; + private static bool CanRunNJulianRuleTest => !PlatformDetection.IsLinuxBionic && RemoteExecutor.IsSupported; [ConditionalTheory(nameof(CanRunNJulianRuleTest))] [PlatformSpecific(TestPlatforms.AnyUnix)]