You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by rm...@apache.org on 2010/04/16 21:16:31 UTC
svn commit: r935048 - in /lucene/dev/trunk/lucene: common-build.xml
contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java
Author: rmuir
Date: Fri Apr 16 19:16:31 2010
New Revision: 935048
URL: http://svn.apache.org/viewvc?rev=935048&view=rev
Log:
LUCENE-2398: allow this test to work from eclipse too, simplify build some more
Modified:
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/lucene/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=935048&r1=935047&r2=935048&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Fri Apr 16 19:16:31 2010
@@ -441,10 +441,6 @@
<sysproperty key="lucene.version" value="${dev.version}"/>
- <!-- contrib/ant IndexTaskTest needs these two system properties -->
- <sysproperty key="docs.dir" file="src/test"/>
- <sysproperty key="index.dir" file="${build.dir}/test/index"/>
-
<!-- contrib/benchmark uses this system property to locate docs data and defined tasks -->
<sysproperty key="tasks.dir" file="${build.dir}/classes/java/org/apache/lucene/benchmark/byTask/tasks"/>
<sysproperty key="benchmark.work.dir" file="@{tempDir}/@{pattern}"/>
Modified: lucene/dev/trunk/lucene/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java?rev=935048&r1=935047&r2=935048&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/ant/src/test/org/apache/lucene/ant/IndexTaskTest.java Fri Apr 16 19:16:31 2010
@@ -39,9 +39,6 @@ public class IndexTaskTest extends Lucen
private final static String docHandler =
"org.apache.lucene.ant.FileExtensionDocumentHandler";
- private String docsDir = System.getProperty("docs.dir");
- private File indexDir = new File(System.getProperty("index.dir"));
-
private Searcher searcher;
private Analyzer analyzer;
private FSDirectory dir;
@@ -55,6 +52,9 @@ public class IndexTaskTest extends Lucen
@Override
protected void setUp() throws Exception {
super.setUp();
+ // slightly hackish way to get the src/test dir
+ String docsDir = getDataFile("test.txt").getParent();
+ File indexDir = TEMP_DIR;
Project project = new Project();
IndexTask task = new IndexTask();