diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2009-01-07 10:37:39 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2009-01-07 10:37:39 +0300 |
| commit | 38a930b1838be5738f0df3ec297cdfb111d7071f (patch) | |
| tree | 0aa55965addba72d0adacf9b4276474c60877feb /mcs/nunit24 | |
| parent | 067bd1817a10eff6a90bb324fda07a5f13619c0b (diff) | |
2009-01-07 Atsushi Enomoto <atsushi@ximian.com>
* ClientUtilities/util/Services/DomainManager.cs :
quick workaround to fix test runner on OSX, by Geoff Norton.
svn path=/trunk/mcs/; revision=122629
Diffstat (limited to 'mcs/nunit24')
| -rw-r--r-- | mcs/nunit24/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/nunit24/ClientUtilities/util/Services/DomainManager.cs | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mcs/nunit24/ChangeLog b/mcs/nunit24/ChangeLog index f6f840554a3..c8b32f8e1dc 100644 --- a/mcs/nunit24/ChangeLog +++ b/mcs/nunit24/ChangeLog @@ -1,3 +1,8 @@ +2009-01-07 Atsushi Enomoto <atsushi@ximian.com> + + * ClientUtilities/util/Services/DomainManager.cs : + quick workaround to fix test runner on OSX, by Geoff Norton. + 2005-11-26 Atsushi Enomoto <atsushi@ximian.com> * App.config, nunit-console.exe.config, diff --git a/mcs/nunit24/ClientUtilities/util/Services/DomainManager.cs b/mcs/nunit24/ClientUtilities/util/Services/DomainManager.cs index 481579d6ee9..624288232ff 100644 --- a/mcs/nunit24/ClientUtilities/util/Services/DomainManager.cs +++ b/mcs/nunit24/ClientUtilities/util/Services/DomainManager.cs @@ -101,6 +101,7 @@ namespace NUnit.Util assemblyResolver.AddFile( typeof( NUnit.Core.RemoteTestRunner ).Assembly.Location );
assemblyResolver.AddFile( typeof( NUnit.Core.ITest ).Assembly.Location );
+if ((int) Environment.OSVersion.Platform != 6) { // Mono workaround for nunit on OSX breakage.
// No reference to extensions, so we do it a different way
string moduleName = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
string nunitDirPath = Path.GetDirectoryName(moduleName);
@@ -110,6 +111,7 @@ namespace NUnit.Util string addinsDirPath = Path.Combine(nunitDirPath, "addins");
assemblyResolver.AddDirectory( addinsDirPath );
+}
// HACK: Only pass down our AddinRegistry one level so that tests of NUnit
// itself start without any addins defined.
|