Skip to content

Commit fb77ec5

Browse files
rolfbjarnemandel-macaque
authored andcommitted
[xharness] Don't generate into the same directory/files for macOS Modern and macOS Full. (#9121)
* [xharness] Don't generate into the same directory/files for macOS Modern and macOS Full. This meant that we were overwriting some generated files, which meant that we were executing the Modern set of tests instead of the Full set of tests for at least some configurations. * Add a few ignored tests to the System.Configuration test now that we actually run it.
1 parent 77dad96 commit fb77ec5

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

tests/bcl-test/macOSFull-xammac_net_4_5_System.Configuration_test.dll.ignore

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,22 @@ MonoTests.System.Configuration.AppSettingsSectionTest.TestFile
55

66
# Expected: not null
77
# But was: null
8-
MonoTests.System.Configuration.ConfigurationManagerTest.TestConnectionStringRetrieval
8+
MonoTests.System.Configuration.ConfigurationManagerTest.TestConnectionStringRetrieval
9+
10+
# The UnixSignalTest breaks NullReferenceException handling in the runtime.
11+
# Any NRE will deadlock the process after this test, so just skip it.
12+
MonoTests.Mono.Unix.UnixSignalTest
13+
14+
# Needs RabbitMQ:
15+
# System.TypeInitializationException : The type initializer for '...' threw an exception.
16+
# ----> System.IO.FileNotFoundException : Could not load the file 'Mono.Messaging.RabbitMQ, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756'.
17+
MonoTests.System.Messaging.TransactionMessageTest
18+
MonoTests.System.Messaging.AdminTest
19+
MonoTests.System.Messaging.AsyncPeekTest
20+
MonoTests.System.Messaging.AsyncReceiveTest
21+
MonoTests.System.Messaging.BasicMessagingTest
22+
MonoTests.System.Messaging.PeekTest
23+
MonoTests.System.Messaging.SelectorTest
24+
25+
# System.ArgumentException : The value's length for key 'data source' exceeds it's limit of '128'.
26+
DbLinqTest.DataContextTest.Ctor_FileOrServerOrConnectionIsFilename

tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/TestImporter/Templates/Managed/XamariniOSTemplate.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ async Task<GeneratedProjects> GenerateMacTestProjectsAsync (IEnumerable<(string
680680
if (!projectDefinition.Validate ())
681681
throw new InvalidOperationException ("xUnit and NUnit assemblies cannot be mixed in a test project.");
682682
// generate the required type registration info
683-
var generatedCodeDir = Path.Combine (GeneratedCodePathRoot, projectDefinition.Name, "mac");
683+
var generatedCodeDir = Path.Combine (GeneratedCodePathRoot, projectDefinition.Name, platform.ToString ());
684684
Directory.CreateDirectory (generatedCodeDir);
685685
var registerTypePath = Path.Combine (generatedCodeDir, "RegisterType-mac.cs");
686686

0 commit comments

Comments
 (0)