Skip to content

Commit 3522c32

Browse files
authored
Re-enable testing on OSX 10.15 (#40524)
* Re-enable testing on OSX 10.15 * ActiveIssue for failing font issue
1 parent 73d8a37 commit 3522c32

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

eng/pipelines/libraries/helix-queues-setup.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,10 @@ jobs:
7878
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
7979
- OSX.1013.Amd64.Open
8080
- OSX.1014.Amd64.Open
81-
# The 10.15 machines aren't in the same configuration, see
82-
# https://github.com/dotnet/runtime/issues/24736
83-
#- OSX.1015.Amd64.Open
81+
- OSX.1015.Amd64.Open
8482
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
85-
- OSX.1013.Amd64.Open
8683
- OSX.1014.Amd64.Open
84+
- OSX.1015.Amd64.Open
8785

8886
# Windows_NT x64
8987
- ${{ if eq(parameters.platform, 'Windows_NT_x64') }}:

src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ public void Equals_Object_ReturnsExpected(FontFamily fontFamily, object other, b
100100
}
101101
}
102102

103+
// This will fail on any platform we use libgdiplus, with any
104+
// installed system fonts whose name is longer than 31 chars.
105+
// macOS 10.15+ ships out of the box with a problem font
106+
[ActiveIssue("https://github.com/dotnet/runtime/issues/40937", TestPlatforms.AnyUnix)]
103107
[ConditionalFact(Helpers.IsDrawingSupported)]
104108
public void Families_Get_ReturnsExpected()
105109
{

0 commit comments

Comments
 (0)