From 3522c32f80684dd3cd4c45aa2e66974967ab422c Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 24 Aug 2020 12:24:50 -0400 Subject: [PATCH] Re-enable testing on OSX 10.15 (#40524) * Re-enable testing on OSX 10.15 * ActiveIssue for failing font issue --- eng/pipelines/libraries/helix-queues-setup.yml | 6 ++---- src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 33d0ea5..bb025f3 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -78,12 +78,10 @@ jobs: - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: - OSX.1013.Amd64.Open - OSX.1014.Amd64.Open - # The 10.15 machines aren't in the same configuration, see - # https://github.com/dotnet/runtime/issues/24736 - #- OSX.1015.Amd64.Open + - OSX.1015.Amd64.Open - ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}: - - OSX.1013.Amd64.Open - OSX.1014.Amd64.Open + - OSX.1015.Amd64.Open # Windows_NT x64 - ${{ if eq(parameters.platform, 'Windows_NT_x64') }}: diff --git a/src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs b/src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs index 5e80145..a87895b 100644 --- a/src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs +++ b/src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs @@ -100,6 +100,10 @@ namespace System.Drawing.Tests } } + // This will fail on any platform we use libgdiplus, with any + // installed system fonts whose name is longer than 31 chars. + // macOS 10.15+ ships out of the box with a problem font + [ActiveIssue("https://github.com/dotnet/runtime/issues/40937", TestPlatforms.AnyUnix)] [ConditionalFact(Helpers.IsDrawingSupported)] public void Families_Get_ReturnsExpected() { -- 2.7.4