Skip to content

Commit

Permalink
Remove CoreFX.issues_linux.rsp file (#33953)
Browse files Browse the repository at this point in the history
* Enable some tests passing locally

* Disable several tests failing in linux CI due to the problem with
libgdiplus

* Enable tests passing locally on Ubuntu 18.04

* Disable several tests failing in
AssemblyLoadContext.InternalLoadFromPath

* Remove CoreFX.issues_linux.rsp file

* Fix condition for including rsp files
  • Loading branch information
MaximLipnin authored Mar 25, 2020
1 parent 7b1926d commit 63bac66
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 51 deletions.
3 changes: 1 addition & 2 deletions eng/testing/tests.targets
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,10 @@
<!-- 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_linux.rsp" Condition="'$(TargetOS)' == 'Linux'" />
<_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'" />
<_rspFileContent Include="$([System.IO.File]::ReadAllText(%(_rspFile.Identity)))" Condition="'$(TargetOS)' != 'OSX' and '$(TargetOS)' != 'Linux'" />
</ItemGroup>

<WriteLinesToFile File="$(MonoRspFile)" Lines="@(_rspFileContent)" Overwrite="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ public static void PrimitiveResourcesAsStrings()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34008", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public static void BinaryFormattedResources()
{
var values = TestData.BinaryFormatted;
Expand Down Expand Up @@ -300,6 +301,7 @@ public static void BinaryFormattedResources()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34008", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public static void BinaryFormattedResourcesWithoutTypeName()
{
var values = TestData.BinaryFormatted;
Expand Down Expand Up @@ -397,6 +399,7 @@ public static void TypeConverterStringResources()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34008", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public static void StreamResources()
{
var values = TestData.Activator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ public static IEnumerable<object[]> EnglishImageResourceData()
}

[ConditionalTheory(Helpers.IsDrawingSupported)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34008", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[MemberData(nameof(EnglishImageResourceData))]
public static void GetObject_Images(string key, object expectedValue)
{
Expand All @@ -277,6 +278,7 @@ public static void GetObject_Images(string key, object expectedValue)
}

[ConditionalTheory(Helpers.IsDrawingSupported)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34008", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[MemberData(nameof(EnglishImageResourceData))]
public static void GetObject_Images_ResourceSet(string key, object expectedValue)
{
Expand Down Expand Up @@ -310,6 +312,7 @@ public static void GetResourceSet_NonStrings(string key, object expectedValue, b
}

[ConditionalTheory(Helpers.IsDrawingSupported)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34008", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[MemberData(nameof(EnglishImageResourceData))]
public static void GetResourceSet_Images(string key, object expectedValue)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,7 @@ public static void GetPermissionSet()
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34030", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[MemberData(nameof(TestingCreateInstanceFromObjectHandleData))]
public static void TestingCreateInstanceFromObjectHandle(string physicalFileName, string assemblyFile, string type, string returnedFullNameType, Type exceptionType)
{
Expand Down Expand Up @@ -846,6 +847,7 @@ public static void TestingCreateInstanceObjectHandle(string assemblyName, string
};

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34030", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[MemberData(nameof(TestingCreateInstanceFromObjectHandleFullSignatureData))]
public static void TestingCreateInstanceFromObjectHandleFullSignature(string physicalFileName, string assemblyFile, string type, bool ignoreCase, BindingFlags bindingAttr, Binder binder, object[] args, CultureInfo culture, object[] activationAttributes, string returnedFullNameType)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public void SerializeHugeObjectGraphs(int limit)

[Theory]
[SkipOnCoreClr("Takes too long on Checked", RuntimeConfiguration.Checked)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34008", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[MemberData(nameof(BasicObjectsRoundtrip_MemberData))]
public void ValidateBasicObjectsRoundtrip(object obj, FormatterAssemblyStyle assemblyFormat, TypeFilterLevel filterLevel, FormatterTypeStyle typeFormat)
{
Expand Down Expand Up @@ -183,6 +184,7 @@ public void ValidateDeserializationOfObjectWithGenericTypeWhichGenericArgumentHa
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34008", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void RoundtripManyObjectsInOneStream()
{
object[][] objects = SerializableObjects_MemberData().ToArray();
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/System.Runtime/tests/System/ActivatorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,7 @@ public void CreateInstance_PublicOnlyValueTypeWithPrivateDefaultConstructor_Thro
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34030", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[MemberData(nameof(TestingCreateInstanceFromObjectHandleData))]
public static void TestingCreateInstanceFromObjectHandle(string physicalFileName, string assemblyFile, string type, string returnedFullNameType, Type exceptionType)
{
Expand Down Expand Up @@ -717,6 +718,7 @@ public static void TestingCreateInstanceObjectHandle(string assemblyName, string
};

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34030", TestPlatforms.Linux, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[MemberData(nameof(TestingCreateInstanceFromObjectHandleFullSignatureData))]
public static void TestingCreateInstanceFromObjectHandleFullSignature(string physicalFileName, string assemblyFile, string type, bool ignoreCase, BindingFlags bindingAttr, Binder binder, object[] args, CultureInfo culture, object[] activationAttributes, string returnedFullNameType)
{
Expand Down
49 changes: 0 additions & 49 deletions src/mono/netcore/CoreFX.issues_linux.rsp

This file was deleted.

0 comments on commit 63bac66

Please sign in to comment.