You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by mh...@apache.org on 2011/09/25 05:03:02 UTC

[Lucene.Net] svn commit: r1175290 - in /incubator/lucene.net/trunk: build/scripts/dot-net-tools.targets test/core/Index/TestIndexWriter.cs test/core/Index/TestStressIndexing2.cs test/core/Lucene.Net.Test.csproj test/core/TestMergeSchedulerExternal.cs

Author: mherndon
Date: Sun Sep 25 03:03:01 2011
New Revision: 1175290

URL: http://svn.apache.org/viewvc?rev=1175290&view=rev
Log:
defining GALLIO constant for tests, passing the constant externally

Modified:
    incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets
    incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
    incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs
    incubator/lucene.net/trunk/test/core/Lucene.Net.Test.csproj
    incubator/lucene.net/trunk/test/core/TestMergeSchedulerExternal.cs

Modified: incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets?rev=1175290&r1=1175289&r2=1175290&view=diff
==============================================================================
--- incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets (original)
+++ incubator/lucene.net/trunk/build/scripts/dot-net-tools.targets Sun Sep 25 03:03:01 2011
@@ -27,7 +27,8 @@
 	<PropertyGroup>
     	<!--MSBuild 4.0 property-->
     	<ProgramFiles32>$(MSBuildProgramFiles32)</ProgramFiles32>
-    	
+    	<DefineConstants></DefineConstants>
+    	<ExternalConstants>GALLIO</ExternalConstants>
     	<!--Use OS env vars as a fallback-->
     	<!-- 
     	<ProgramFiles32 Condition=" '' == '$(ProgramFiles32)'">$(ProgramFiles%28x86%29)</ProgramFiles32>

Modified: incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs?rev=1175290&r1=1175289&r2=1175290&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs Sun Sep 25 03:03:01 2011
@@ -4111,7 +4111,7 @@ namespace Lucene.Net.Index
         }
 
         // LUCENE-1214
-#if !DEBUG
+#if GALLIO
         [Ignore]
         // TODO: figure out why this fails with nunit & gallio in release mode
 #endif 
@@ -5936,7 +5936,7 @@ namespace Lucene.Net.Index
             }
         }
 
-#if !DEBUG
+#if GALLIO
         [Ignore]
         // TODO: figure out why this fails with nunit & gallio in release mode
 #endif 

Modified: incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs?rev=1175290&r1=1175289&r2=1175290&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestStressIndexing2.cs Sun Sep 25 03:03:01 2011
@@ -80,7 +80,7 @@ namespace Lucene.Net.Index
 			}
 		}
 		
-#if !DEBUG
+#if GALLIO
         [Ignore]
         // TODO: figure out why this fails in gallio in release mode
 #endif 

Modified: incubator/lucene.net/trunk/test/core/Lucene.Net.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Lucene.Net.Test.csproj?rev=1175290&r1=1175289&r2=1175290&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Lucene.Net.Test.csproj (original)
+++ incubator/lucene.net/trunk/test/core/Lucene.Net.Test.csproj Sun Sep 25 03:03:01 2011
@@ -90,6 +90,9 @@
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
+  <PropertyGroup>
+  	<DefineConstants>$(DefineConstants);$(ExternalConstants)</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

Modified: incubator/lucene.net/trunk/test/core/TestMergeSchedulerExternal.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/TestMergeSchedulerExternal.cs?rev=1175290&r1=1175289&r2=1175290&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/TestMergeSchedulerExternal.cs (original)
+++ incubator/lucene.net/trunk/test/core/TestMergeSchedulerExternal.cs Sun Sep 25 03:03:01 2011
@@ -145,7 +145,7 @@ namespace Lucene.Net
 			}
 		}
 		
-#if !DEBUG
+#if GALLIO
         // TODO: figure out why this fails in release mode when running in gallio.
         [Ignore]
 #endif