diff options
| author | Sandy Armstrong <sandy@xamarin.com> | 2019-01-25 18:05:34 +0300 |
|---|---|---|
| committer | Sandy Armstrong <sandy@xamarin.com> | 2019-01-25 18:24:42 +0300 |
| commit | 2325b5d4c5f79fcbe37acf617eb87e23c56a1684 (patch) | |
| tree | f9c8fd4da08b7bbac6b26ef1602fd35ec7ac4bd9 /main/src/addins/MonoDevelop.UnitTesting.NUnit | |
| parent | 4a92358ddf393435c36fb742aeecda2e45d9c238 (diff) | |
| parent | 2e188887d8e5ee2901fd803d4374f0c0fb8ad69a (diff) | |
Merge remote-tracking branch 'origin/master' into pr-sandy-md-master
Diffstat (limited to 'main/src/addins/MonoDevelop.UnitTesting.NUnit')
2 files changed, 6 insertions, 0 deletions
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs index 51fa5342d2..2cbf788fe0 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs @@ -48,6 +48,8 @@ namespace MonoDevelop.UnitTesting.NUnit.External IRemoteEventListener listener; readonly string assemblyDirectory; + public ProcessExecutionArchitecture ProcessExecutionArchitecture { get; set; } + public ExternalTestRunner () { } @@ -61,6 +63,7 @@ namespace MonoDevelop.UnitTesting.NUnit.External { var exePath = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), version.ToString (), "NUnitRunner.exe"); connection = new RemoteProcessConnection (exePath, assemblyDirectory, executionHandler, console, Runtime.MainSynchronizationContext); + connection.ProcessExecutionArchitecture = ProcessExecutionArchitecture; connection.AddListener (this); return connection.Connect (); } diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs index b75a993743..5b3e57bbed 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs @@ -44,6 +44,7 @@ using System.Xml.Linq; using System.Linq; using System.Globalization; using System.Threading.Tasks; +using MonoDevelop.Core.Assemblies; namespace MonoDevelop.UnitTesting.NUnit { @@ -333,6 +334,7 @@ namespace MonoDevelop.UnitTesting.NUnit try { if (File.Exists (ld.Path)) { runner = new ExternalTestRunner (Path.GetDirectoryName (ld.Path)); + runner.ProcessExecutionArchitecture = AssemblyUtilities.GetProcessExecutionArchitectureForAssembly (ld.Path); runner.Connect (ld.NUnitVersion).Wait (); var supportAssemblies = new List<string> (ld.SupportAssemblies.Result); ld.Info = runner.GetTestInfo (ld.Path, supportAssemblies).Result; @@ -398,6 +400,7 @@ namespace MonoDevelop.UnitTesting.NUnit OperationConsoleFactory.CreateConsoleOptions.Default.WithTitle (GettextCatalog.GetString ("Unit Tests"))); ExternalTestRunner runner = new ExternalTestRunner (Path.GetDirectoryName (AssemblyPath)); + runner.ProcessExecutionArchitecture = AssemblyUtilities.GetProcessExecutionArchitectureForAssembly (AssemblyPath); runner.Connect (NUnitVersion, testContext.ExecutionContext.ExecutionHandler, console).Wait (); LocalTestMonitor localMonitor = new LocalTestMonitor (testContext, test, suiteName, testName != null); |