You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/03/28 02:32:30 UTC
svn commit: r1582577 -
/lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
Author: markrmiller
Date: Fri Mar 28 01:32:29 2014
New Revision: 1582577
URL: http://svn.apache.org/r1582577
Log:
SOLR-5914: Fix morphlines contrib tests use of solrhome.
Modified:
lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
Modified: lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java?rev=1582577&r1=1582576&r2=1582577&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java Fri Mar 28 01:32:29 2014
@@ -46,7 +46,7 @@ import com.google.common.collect.ListMul
import com.typesafe.config.Config;
public abstract class AbstractSolrMorphlineZkTestBase extends AbstractFullDistribZkTestBase {
- private static final File solrHomeDirectory = createTempDir();
+ private static File solrHomeDirectory;
protected static final String RESOURCES_DIR = getFile("morphlines-core.marker").getParent();
private static final File SOLR_INSTANCE_DIR = new File(RESOURCES_DIR + "/solr");
@@ -68,6 +68,7 @@ public abstract class AbstractSolrMorphl
@BeforeClass
public static void setupClass() throws Exception {
+ solrHomeDirectory = createTempDir();
AbstractZkTestCase.SOLRHOME = solrHomeDirectory;
FileUtils.copyDirectory(SOLR_INSTANCE_DIR, solrHomeDirectory);
}