# https://github.com/mono/mono/issues/14854
-nomethod Microsoft.VisualBasic.Tests.ErrObjectTests.Clear
+# Windows-only tests, incorrect platform guards (https://github.com/dotnet/corefx/pull/40365)
+-nomethod Microsoft.VisualBasic.Tests.InteractionTests.SaveSetting
+-nomethod Microsoft.VisualBasic.Tests.InteractionTests.DeleteSetting
+-nomethod Microsoft.VisualBasic.Tests.InteractionTests.GetAllSettings
+-nomethod Microsoft.VisualBasic.Tests.InteractionTests.GetSetting
+
####################################################################
## System.CodeDom.Tests
####################################################################
-nomethod System.Reflection.Context.Tests.CustomReflectionContextTests.MapType_Interface_Throws
####################################################################
-## System.Reflection.TypeExtensions.CoreCLR.Tests
+## System.Reflection.Metadata.Tests
####################################################################
# Assertion... Expected true, got false
# https://github.com/mono/mono/issues/15194
-nomethod System.Reflection.Tests.MetadataTokenTests.SuccessImpliesNonNilWithCorrectTable
+# Test broken on Mono, added in https://github.com/dotnet/corefx/pull/40581
+-nomethod System.Reflection.Tests.MetadataLoadContextTests.RelocatableAssembly
####################################################################
## System.Runtime.Loader.DefaultContext.Tests
-nomethod System.IO.Tests.Directory_NotifyFilter_Tests.FileSystemWatcher_Directory_NotifyFilter_LastWriteTime
# Flaky test
--nomethod System.Security.Cryptography.Rsa.Tests.RSAKeyFileTests.ReadEncryptedRsa16384
\ No newline at end of file
+-nomethod System.Security.Cryptography.Rsa.Tests.RSAKeyFileTests.ReadEncryptedRsa16384
+
+####################################################################
+## System.Security.Cryptography.Encoding.Tests
+####################################################################
+
+# Broken array copying (https://github.com/mono/mono/issues/16686)
+-nomethod System.Security.Cryptography.Encoding.Tests.OidTests.LookupOidByFriendlyName_Method_InverseCase
+-nomethod System.Security.Cryptography.Encoding.Tests.OidTests.LookupOidByValue_Ctor
+-nomethod System.Security.Cryptography.Encoding.Tests.OidTests.Oid_StringString_NullFriendlyName
+-nomethod System.Security.Cryptography.Encoding.Tests.OidTests.LookupOidByFriendlyName_Ctor
run-tests-corefx-%: prepare update-tests-corefx
@echo ""
@echo "***************** $* $${TEST_COUNTER}*********************"
- @cp corefx/restore/corefx-restore.deps.json corefx/tests/extracted/$*/xunit.console.deps.json
- @cp corefx/restore/corefx-restore.deps.json corefx/tests/extracted/$*/Microsoft.DotNet.RemoteExecutorHost.deps.json
+ @cp corefx/restore/corefx-restore.deps.json corefx/tests/extracted/$*/$*.deps.json
@cp corefx/restore/corefx-restore.runtimeconfig.dev.json corefx/tests/extracted/$*/$*.runtimeconfig.dev.json
@cp corefx/restore/corefx-restore.dll corefx/tests/extracted/$*/corefx-restore.dll
@sed -i -e 's/5.0.0\"/$(NETCOREAPP_VERSION)\"/g' corefx/tests/extracted/$*/*.runtimeconfig.json
cd corefx/tests/extracted/$* && \
- COMPlus_DebugWriteToStdErr=1 $(CURDIR)/./dotnet exec --runtimeconfig $*.runtimeconfig.json --fx-version "$(NETCOREAPP_VERSION)" xunit.console.dll $*.dll \
+ COMPlus_DebugWriteToStdErr=1 $(CURDIR)/./dotnet exec \
+ --runtimeconfig $*.runtimeconfig.json --additional-deps $*.deps.json \
+ --fx-version "$(NETCOREAPP_VERSION)" xunit.console.dll $*.dll \
-html ../../TestResult-$*.html -xml ../../TestResult-$*-netcore-xunit.xml \
$(XUNIT_FLAGS) @../../../../CoreFX.issues.rsp \
$(FIXTURE)