diff options
| author | Geoff Norton <grompf@sublimeintervention.com> | 2009-01-07 20:56:07 +0300 |
|---|---|---|
| committer | Geoff Norton <grompf@sublimeintervention.com> | 2009-01-07 20:56:07 +0300 |
| commit | d301307c08f7a2d84b27232b475065a30aa336ec (patch) | |
| tree | c153c5bd82d014dc83a9e130979cb8a626f6406b /mcs/nunit24 | |
| parent | 75a3b2d391572f66eca836fba088b479d777fbac (diff) | |
2009-01-07 Geoff Norton <gnorton@novell.com>
* Revert the OSX workaround to nunit, as the runtime is fixed now
svn path=/trunk/mcs/; revision=122687
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, 0 insertions, 7 deletions
diff --git a/mcs/nunit24/ChangeLog b/mcs/nunit24/ChangeLog index c8b32f8e1dc..f6f840554a3 100644 --- a/mcs/nunit24/ChangeLog +++ b/mcs/nunit24/ChangeLog @@ -1,8 +1,3 @@ -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 624288232ff..481579d6ee9 100644 --- a/mcs/nunit24/ClientUtilities/util/Services/DomainManager.cs +++ b/mcs/nunit24/ClientUtilities/util/Services/DomainManager.cs @@ -101,7 +101,6 @@ 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);
@@ -111,7 +110,6 @@ if ((int) Environment.OSVersion.Platform != 6) { // Mono workaround for nunit on 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.
|