Skip to content

[xharness] Don't generate into the same directory/files for macOS Modern and macOS Full. #9121

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.

Sign up for GitHub

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

Merged
rolfbjarne merged 3 commits into from
Jul 21, 2020
Merged

[xharness] Don't generate into the same directory/files for macOS Modern and macOS Full. #9121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5661e5
[xharness] Don't generate into the same directory/files for macOS Mod…
rolfbjarne Jul 17, 2020
6f6cb82
Merge remote-tracking branch 'origin/main' into xharness-separate-mac
rolfbjarne Jul 20, 2020
b0142e1
Add a few ignored to the System.Configuration test now that we actual…
rolfbjarne Jul 21, 2020
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
20 changes: 19 additions & 1 deletion tests/bcl-test/macOSFull-xammac_net_4_5_System.Configuration_test.dll.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,22 @@ MonoTests.System.Configuration.AppSettingsSectionTest.TestFile

# Expected: not null
# But was: null
MonoTests.System.Configuration.ConfigurationManagerTest.TestConnectionStringRetrieval
MonoTests.System.Configuration.ConfigurationManagerTest.TestConnectionStringRetrieval

# The UnixSignalTest breaks NullReferenceException handling in the runtime.
# Any NRE will deadlock the process after this test, so just skip it.
MonoTests.Mono.Unix.UnixSignalTest

# Needs RabbitMQ:
# System.TypeInitializationException : The type initializer for '...' threw an exception.
# ----> System.IO.FileNotFoundException : Could not load the file 'Mono.Messaging.RabbitMQ, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756'.
MonoTests.System.Messaging.TransactionMessageTest
MonoTests.System.Messaging.AdminTest
MonoTests.System.Messaging.AsyncPeekTest
MonoTests.System.Messaging.AsyncReceiveTest
MonoTests.System.Messaging.BasicMessagingTest
MonoTests.System.Messaging.PeekTest
MonoTests.System.Messaging.SelectorTest

# System.ArgumentException : The value's length for key 'data source' exceeds it's limit of '128'.
DbLinqTest.DataContextTest.Ctor_FileOrServerOrConnectionIsFilename
2 changes: 1 addition & 1 deletion ...Microsoft.DotNet.XHarness.iOS.Shared/TestImporter/Templates/Managed/XamariniOSTemplate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ async Task<GeneratedProjects> GenerateMacTestProjectsAsync (IEnumerable<(string
if (!projectDefinition.Validate ())
throw new InvalidOperationException ("xUnit and NUnit assemblies cannot be mixed in a test project.");
// generate the required type registration info
var generatedCodeDir = Path.Combine (GeneratedCodePathRoot, projectDefinition.Name, "mac");
var generatedCodeDir = Path.Combine (GeneratedCodePathRoot, projectDefinition.Name, platform.ToString ());
Directory.CreateDirectory (generatedCodeDir);
var registerTypePath = Path.Combine (generatedCodeDir, "RegisterType-mac.cs");

Expand Down