Skip to content

Commit

Permalink
[mono] Remove CoreFX.issues_windows.rsp file (#32592)
Browse files Browse the repository at this point in the history
Changes:
- enabled `runtime (Libraries Test Run release mono Windows_NT x64 Debug)` CI lane (Windows Nano Server CI leg is disabled);
- enabled the tests that pass;
- marked failing test assemblies/classes/methods with `ActiveIssue` attribute using respective GH issues;
- removed CoreFX.issues_windows.rsp file and related mono rsp arguments.

Fixes #1980
  • Loading branch information
MaximLipnin authored Apr 10, 2020
1 parent fd4831f commit ab6e225
Show file tree
Hide file tree
Showing 122 changed files with 280 additions and 101 deletions.
6 changes: 4 additions & 2 deletions eng/pipelines/libraries/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,14 @@ jobs:
- Windows.81.Amd64.Open
- Windows.10.Amd64.ServerRS5.Open
- Windows.10.Amd64.Server19H1.Open
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504
- ${{ 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
- Windows.10.Amd64.Server19H1.ES.Open
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504
- ${{ if ne(parameters.jobParameters.runtimeFlavor, 'mono') }}:
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504

# NET472
- ${{ if eq(parameters.jobParameters.framework, 'net472') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ jobs:
runtimeFlavor: mono
buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
platforms:
# - Windows_NT_x64
- Windows_NT_x64
- OSX_x64
- Linux_arm64
- Linux_x64
Expand Down
15 changes: 0 additions & 15 deletions eng/testing/tests.targets
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
<RunScriptHost Condition="'$(TargetOS)' == 'Windows_NT'">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
<RunScriptHost Condition="'$(TargetOS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost>

<!-- TODO: remove rsp argument when rsp files are removed: https://github.com/dotnet/runtime/issues/1980. -->
<MonoRspFile>$(RunWorkingDirectory)$(MonoRspFileName)</MonoRspFile>
</PropertyGroup>

<!-- Archive test binaries. -->
Expand Down Expand Up @@ -75,17 +73,6 @@

<Exec Condition="'$(TargetOS)' != 'Windows_NT'" Command="chmod +x $(RunScriptOutputPath)" />

<!-- Generate Mono .rsp file -->
<!-- TODO: remove when rsp files are removed: https://github.com/dotnet/runtime/issues/1980. -->
<ItemGroup>
<_rspFile Include="$(TestRspFile)" Condition="'$(TestRspFile)' != ''" />
<_rspFile Include="$(MonoProjectRoot)netcore\CoreFX.issues_windows.rsp" Condition="'$(TargetOS)' == 'Windows_NT'" />
</ItemGroup>
<ItemGroup>
<_rspFileContent Include="$([System.IO.File]::ReadAllText(%(_rspFile.Identity)))" Condition="'$(TargetOS)' != 'OSX' and '$(TargetOS)' != 'Linux'" />
</ItemGroup>

<WriteLinesToFile File="$(MonoRspFile)" Lines="@(_rspFileContent)" Overwrite="true" />
</Target>

<Target Name="ValidateTestPlatform">
Expand All @@ -108,8 +95,6 @@
DependsOnTargets="ValidateTestPlatform">
<PropertyGroup>
<RunTestsCommand>"$(RunScriptOutputPath)" --runtime-path "$(TestHostRootPath.TrimEnd('\/'))"</RunTestsCommand>
<!-- TODO: remove rsp argument when rsp files are removed: https://github.com/dotnet/runtime/issues/1980. -->
<RunTestsCommand Condition="'$(RuntimeFlavor)' == 'Mono'">$(RunTestsCommand) --rsp-file "$(MonoRspFile)"</RunTestsCommand>
<RunTestsCommand Condition="'$(TestRspFile)' != '' and '$(RuntimeFlavor)' != 'Mono'">$(RunTestsCommand) --rsp-file "$(TestRspFile)"</RunTestsCommand>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public async Task ReceiveAsync_UTF8SplitAcrossMultipleBuffers_ValidDataReceived(
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[InlineData(0b_1000_0001, 0b_0_000_0001, false)] // fin + text, no mask + length == 1
[InlineData(0b_1100_0001, 0b_0_000_0001, true)] // fin + rsv1 + text, no mask + length == 1
[InlineData(0b_1010_0001, 0b_0_000_0001, true)] // fin + rsv2 + text, no mask + length == 1
Expand Down Expand Up @@ -147,6 +148,7 @@ public async Task ReceiveAsync_InvalidFrameHeader_AbortsAndThrowsException(byte
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public async Task ReceiveAsync_ServerSplitHeader_ValidDataReceived()
{
using (Socket listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
Expand Down
1 change: 1 addition & 0 deletions src/libraries/Common/tests/Tests/System/StringTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7215,6 +7215,7 @@ public static void InternalTestAotSubset()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34577", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public static unsafe void NormalizationTest() // basic test; more tests in globalization tests
{
// U+0063 LATIN SMALL LETTER C
Expand Down
4 changes: 0 additions & 4 deletions src/libraries/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@
<ILLinkClearInitLocals Condition="'$(IsSourceProject)' == 'true' and '$(Language)' != 'VB'">true</ILLinkClearInitLocals>
</PropertyGroup>

<PropertyGroup>
<MonoRspFileName>mono.issues.rsp</MonoRspFileName>
</PropertyGroup>

<PropertyGroup Condition="'$(BuildAllConfigurations)' != 'true'">
<!-- We add extra binplacing for the test shared framework until we can get hardlinking with the runtime directory working on all platforms -->
<BinPlaceTestSharedFramework Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'">true</BinPlaceTestSharedFramework>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ private void SetSecret(string id, string key, string value)
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void AddUserSecrets_FindsAssemblyAttribute()
{
var randValue = Guid.NewGuid().ToString();
Expand All @@ -67,6 +68,7 @@ public void AddUserSecrets_FindsAssemblyAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void AddUserSecrets_FindsAssemblyAttributeFromType()
{
var randValue = Guid.NewGuid().ToString();
Expand Down Expand Up @@ -107,6 +109,7 @@ public void AddUserSecrets_DoesNotThrowsIfOptional()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void AddUserSecrets_With_SecretsId_Passed_Explicitly()
{
var userSecretsId = Guid.NewGuid().ToString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public class ArrayTests : IDisposable
";

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void DifferentConfigSources_Merged_KeysAreSorted()
{
var config = BuildConfig();
Expand Down Expand Up @@ -76,6 +77,7 @@ public void DifferentConfigSources_Merged_KeysAreSorted()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void DifferentConfigSources_Merged_WithOverwrites()
{
var config = BuildConfig();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ public void MissingFileDoesNotIncludesAbsolutePathIfWithNoPhysicalPath()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void LoadAndCombineKeyValuePairsFromDifferentConfigurationProviders()
{
WriteTestFiles();
Expand Down Expand Up @@ -247,6 +248,7 @@ public void LoadAndCombineKeyValuePairsFromDifferentConfigurationProviders()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void LoadAndCombineKeyValuePairsFromDifferentConfigurationProvidersWithAbsolutePath()
{
WriteTestFiles();
Expand Down Expand Up @@ -287,6 +289,7 @@ public void LoadAndCombineKeyValuePairsFromDifferentConfigurationProvidersWithAb
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void CanOverrideValuesWithNewConfigurationProvider()
{
WriteTestFiles();
Expand Down Expand Up @@ -359,6 +362,7 @@ public IConfigurationProvider Build(IConfigurationBuilder builder)
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void OnLoadErrorWillBeCalledOnJsonParseError()
{
_fileSystem.WriteFile(Path.Combine(_basePath, "error.json"), @"{""JsonKey1"": ", absolute: true);
Expand Down Expand Up @@ -387,6 +391,7 @@ public void OnLoadErrorWillBeCalledOnJsonParseError()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void OnLoadErrorWillBeCalledOnXmlParseError()
{
_fileSystem.WriteFile("error.xml", @"gobblygook");
Expand Down Expand Up @@ -414,6 +419,7 @@ public void OnLoadErrorWillBeCalledOnXmlParseError()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void OnLoadErrorWillBeCalledOnIniLoadError()
{
_fileSystem.WriteFile("error.ini", @"IniKey1=IniValue1
Expand Down Expand Up @@ -441,6 +447,7 @@ public void OnLoadErrorWillBeCalledOnIniLoadError()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void OnLoadErrorCanIgnoreErrors()
{
_fileSystem.WriteFile("error.json", @"{""JsonKey1"": ");
Expand Down Expand Up @@ -813,6 +820,7 @@ await WaitForChange(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void LoadIncorrectJsonFile_ThrowException()
{
var json = @"{
Expand All @@ -829,6 +837,7 @@ public void LoadIncorrectJsonFile_ThrowException()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void SetBasePathCalledMultipleTimesForEachSourceLastOneWins()
{
var builder = new ConfigurationBuilder();
Expand Down Expand Up @@ -862,6 +871,7 @@ public void SetBasePathCalledMultipleTimesForEachSourceLastOneWins()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void GetDefaultBasePathForSources()
{
var builder = new ConfigurationBuilder();
Expand Down Expand Up @@ -891,6 +901,7 @@ public void GetDefaultBasePathForSources()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void CanEnumerateProviders()
{
var config = CreateBuilder()
Expand Down Expand Up @@ -937,6 +948,7 @@ await WaitForChange(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void BindingDoesNotThrowIfReloadedDuringBinding()
{
WriteTestFiles();
Expand Down
Loading

0 comments on commit ab6e225

Please sign in to comment.