소스 검색

2009-01-07 Geoff Norton <[email protected]>

	* Revert the OSX workaround to nunit, as the runtime is fixed now

svn path=/trunk/mcs/; revision=122687
Geoff Norton 17 년 전
부모
커밋
d301307c08
2개의 변경된 파일0개의 추가작업 그리고 7개의 파일을 삭제
  1. 0 5
      mcs/nunit24/ChangeLog
  2. 0 2
      mcs/nunit24/ClientUtilities/util/Services/DomainManager.cs

+ 0 - 5
mcs/nunit24/ChangeLog

@@ -1,8 +1,3 @@
-2009-01-07  Atsushi Enomoto  <[email protected]>
-
-	* ClientUtilities/util/Services/DomainManager.cs :
-	  quick workaround to fix test runner on OSX, by Geoff Norton.
-
 2005-11-26  Atsushi Enomoto  <[email protected]>
 
 	* App.config, nunit-console.exe.config,

+ 0 - 2
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.