Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce usage of Win7 and Win8 queues, move to CI and add CI runs in Win arm/arm64 #35690

Merged
merged 6 commits into from
May 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions eng/pipelines/libraries/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,17 @@ jobs:
# netcoreapp
- ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net472') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- Windows.7.Amd64.Open
# Bring back once: https://github.com/dotnet/runtime/issues/35689 is fixed
# - Windows.7.Amd64.Open
- Windows.81.Amd64.Open
- Windows.10.Amd64.ServerRS5.Open
- Windows.10.Amd64.Server19H1.Open
- ${{ if ne(parameters.jobParameters.runtimeFlavor, 'mono') }}:
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
- Windows.7.Amd64.Open
- Windows.81.Amd64.Open
# Bring back once: https://github.com/dotnet/runtime/issues/35689 is fixed
# - Windows.7.Amd64.Open
# - Windows.81.Amd64.Open
- Windows.10.Amd64.Server19H1.ES.Open
- ${{ if ne(parameters.jobParameters.runtimeFlavor, 'mono') }}:
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504
Expand All @@ -115,19 +117,29 @@ jobs:
- ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net472') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- Windows.7.Amd64.Open
- Windows.81.Amd64.Open
# Bring back once: https://github.com/dotnet/runtime/issues/35689 is fixed
# - Windows.81.Amd64.Open
- Windows.10.Amd64.ServerRS5.Open
- Windows.10.Amd64.Server19H1.Open
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
- ${{ if eq(parameters.jobParameters.buildConfig, 'Release') }}:
- Windows.7.Amd64.Open
- Windows.81.Amd64.Open
- Windows.10.Amd64.Server19H1.ES.Open
- ${{ if eq(parameters.jobParameters.buildConfig, 'Debug') }}:
# Bring back once: https://github.com/dotnet/runtime/issues/35689 is fixed
# - Windows.7.Amd64.Open
# - Windows.81.Amd64.Open
- Windows.10.Amd64.Server19H1.Open

# NET472
- ${{ if eq(parameters.jobParameters.framework, 'net472') }}:
- Windows.10.Amd64.Client19H1.Open

# Windows_NT arm
- ${{ if eq(parameters.platform, 'Windows_NT_arm') }}:
- Windows.10.Arm64v8.Open

# Windows_NT arm64
- ${{ if eq(parameters.platform, 'Windows_NT_arm64') }}:
- Windows.10.Arm64.Open

${{ insert }}: ${{ parameters.jobParameters }}
3 changes: 3 additions & 0 deletions eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,9 @@ jobs:
buildConfig: Release
platforms:
- Windows_NT_x86
- ${{ if eq(variables['isFullMatrix'], true) }}:
- Windows_NT_arm
- Windows_NT_arm64
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
jobParameters:
isOfficialBuild: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ public void EmitsExpressionTreeBuiltEvent()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/35753", TestPlatforms.Windows)]
public void EmitsDynamicMethodBuiltEvent()
{
// Arrange
Expand Down
6 changes: 6 additions & 0 deletions src/libraries/System.Drawing.Common/tests/BitmapTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,12 @@ public void SaveWmfAsPngDoesntChangeImageBoundaries()
throw new SkipTestException("GDI+ 1.1 is not supported");
}

if (PlatformDetection.IsArmOrArm64Process)
{
// https://github.com/dotnet/runtime/issues/28859
throw new SkipTestException("Arm precision");
}

string output = GetTestFilePath() + ".png";
using Stream wmfStream = File.OpenRead(Helpers.GetTestBitmapPath("gdiwmfboundariesbug.wmf"));
using Image bitmapFromWmf = Bitmap.FromStream(wmfStream);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
public static partial class DataContractSerializerTests
{
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34962", TestRuntimes.Mono)]
public static void DCS_MyPersonSurrogate_Stress()
{
// This test is to verify a bug fix made in ObjectToIdCache.cs.
Expand Down
7 changes: 7 additions & 0 deletions src/libraries/System.Runtime/tests/System/ArgIteratorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.DotNet.XUnitExtensions;
using System.Globalization;
using System.Reflection;
using Xunit;
Expand Down Expand Up @@ -90,6 +91,12 @@ private static void VerifyTypes(Type[] types, __arglist)
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsArgIteratorNotSupported))]
public static unsafe void ArgIterator_Throws_PlatformNotSupportedException()
{
if (PlatformDetection.IsWindows && PlatformDetection.IsArmProcess)
{
// Active Issue: https://github.com/dotnet/runtime/issues/35754
throw new SkipTestException("ArgIterator doesn't throw not supported in ArmProcess");
}

Assert.Throws<PlatformNotSupportedException>(() => new ArgIterator(new RuntimeArgumentHandle()));
Assert.Throws<PlatformNotSupportedException>(() => {
fixed (void* p = "test")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.DotNet.XUnitExtensions;
using Xunit;

namespace System.Runtime.Tests
Expand All @@ -26,10 +27,15 @@ public void Ctor_Negative_ThrowsArgumentOutOfRangeException(int sizeInMegabytes)
AssertExtensions.Throws<ArgumentOutOfRangeException>("sizeInMegabytes", () => new MemoryFailPoint(sizeInMegabytes));
}

[Fact]
[ConditionalFact]
[PlatformSpecific(TestPlatforms.Windows)] //https://github.com/dotnet/runtime/issues/6879
public void Ctor_LargeSizeInMegabytes_ThrowsInsufficientMemoryException()
{
if (PlatformDetection.IsArmProcess)
{
throw new SkipTestException("[ActiveIssue: https://github.com/dotnet/runtime/issues/35805]");
}

Assert.Throws<InsufficientMemoryException>(() => new MemoryFailPoint(int.MaxValue));
}
}
Expand Down