You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2013/07/09 16:09:48 UTC
svn commit: r1501279 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/common-build.xml solr/ solr/common-build.xml solr/core/
solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java
Author: uschindler
Date: Tue Jul 9 14:09:48 2013
New Revision: 1501279
URL: http://svn.apache.org/r1501279
Log:
Merged revision(s) 1501278 from lucene/dev/trunk:
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/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1501279&r1=1501278&r2=1501279&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Tue Jul 9 14:09:48 2013
@@ -971,6 +971,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/branches/branch_4x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/common-build.xml?rev=1501279&r1=1501278&r2=1501279&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/common-build.xml Tue Jul 9 14:09: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/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java?rev=1501279&r1=1501278&r2=1501279&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java Tue Jul 9 14:09: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();