svn commit: r1501278 - in /lucene/dev/trunk: lucene/common-build.xml solr/common-build.xml solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java

[us...@apache.org]

Author: uschindler
Date: Tue Jul  9 14:08:48 2013
New Revision: 1501278

URL: http://svn.apache.org/r1501278
Log:
SOLR-5022: Make it possible to disable HDFS tests on ANT command line (so ASF Jenkins can use it). Windows is disabled by default, too.

Modified:
    lucene/dev/trunk/lucene/common-build.xml
    lucene/dev/trunk/solr/common-build.xml
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1501278&r1=1501277&r2=1501278&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Tue Jul  9 14:08:48 2013
@@ -968,6 +968,7 @@
                 <propertyref prefix="tests.badapples" />
                 <propertyref prefix="tests.timeoutSuite" />
                 <propertyref prefix="tests.jettyConnector" />
+                <propertyref prefix="tests.disableHdfs" />
             </syspropertyset>
 
             <!-- Pass randomized settings to the forked JVM. -->

Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1501278&r1=1501277&r2=1501278&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Tue Jul  9 14:08:48 2013
@@ -123,6 +123,12 @@
     </sequential>
   </macrodef>
 
+  <!-- we don't want to run HDFS tests on Windows, because they require Cygwin.
+    If you have Cygwin, you can override this property on command line: -->
+  <condition property="tests.disableHdfs" value="true">
+    <os family="windows"/>
+  </condition>
+
   <target name="validate" depends="compile-tools">
   </target>
 

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java?rev=1501278&r1=1501277&r2=1501278&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java Tue Jul  9 14:08:48 2013
@@ -7,7 +7,6 @@ import java.util.Locale;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.lucene.util.Constants;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.junit.Assert;
@@ -34,9 +33,8 @@ public class HdfsTestUtil {
   private static Locale savedLocale;
 
   public static MiniDFSCluster setupClass(String dataDir) throws Exception {
-    LuceneTestCase.assumeFalse("HDFS tests on Windows require Cygwin", Constants.WINDOWS);
-    LuceneTestCase.assumeFalse("HDFS do not work well with FreeBSD blackhole setup", Constants.FREE_BSD);
-   // LuceneTestCase.assumeFalse("HDFS tests on Windows require Cygwin", Constants.F);
+    LuceneTestCase.assumeFalse("HDFS tests were disabled by -Dtests.disableHdfs",
+      Boolean.parseBoolean(System.getProperty("tests.disableHdfs", "false")));
     File dir = new File(dataDir);
     new File(dataDir).mkdirs();