You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/03/26 22:48:02 UTC
svn commit: r1305574 - in /lucene/dev/branches/branch_3x/solr: build.xml
common-build.xml core/src/test-files/solr/
core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
Author: rmuir
Date: Mon Mar 26 20:48:01 2012
New Revision: 1305574
URL: http://svn.apache.org/viewvc?rev=1305574&view=rev
Log:
SOLR-3268: don't create indexes under core/src/test-files/solr/data
Modified:
lucene/dev/branches/branch_3x/solr/build.xml
lucene/dev/branches/branch_3x/solr/common-build.xml
lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1305574&r1=1305573&r2=1305574&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Mon Mar 26 20:48:01 2012
@@ -213,8 +213,6 @@
<exclude name="**/.gitignore" />
</fileset>
</delete>
- <echo message="TODO: fix tests to not write files to 'core/src/test-files/solr/data'!" />
- <delete dir="core/src/test-files/solr/data" />
</target>
<target name="clean-dest"
Modified: lucene/dev/branches/branch_3x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/common-build.xml?rev=1305574&r1=1305573&r2=1305574&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/common-build.xml Mon Mar 26 20:48:01 2012
@@ -94,7 +94,7 @@
<path id="solr.test.base.classpath">
<pathelement path="${common-solr.dir}/build/solr-test-framework/classes/java"/>
- <pathelement path="${tests.userdir}"/>
+ <pathelement path="${build.dir}/test-files"/>
<path refid="test.base.classpath"/>
</path>
@@ -178,7 +178,7 @@
</target>
<target name="compile-core" depends="prep-lucene-jars,common.compile-core"/>
- <target name="compile-test" depends="compile-solr-test-framework,common.compile-test"/>
+ <target name="compile-test" depends="sync-resources,compile-solr-test-framework,common.compile-test"/>
<target name="dist" depends="jar-core">
<copy file="${build.dir}/${fullnamever}.jar" todir="${dist}"/>
@@ -269,6 +269,12 @@
</ant>
</target>
+ <target name="sync-resources">
+ <copy todir="${build.dir}/test-files">
+ <fileset dir="${tests.userdir}"/>
+ </copy>
+ </target>
+
<!-- Solr test-framework targets -->
<target name="compile-solr-test-framework" description="Compile the Solr test-framework" unless="solr.test.framework.compiled">
<ant dir="${common-solr.dir}/test-framework" target="compile-core" inheritAll="false">
Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java?rev=1305574&r1=1305573&r2=1305574&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java Mon Mar 26 20:48:01 2012
@@ -29,6 +29,8 @@ import org.junit.Test;
* A test case for the several HTTP cache headers emitted by Solr
*/
public class NoCacheHeaderTest extends CacheHeaderTestBase {
+ // TODO: fix this test not to directly use the test-files copied to build/
+ // as its home. it could interfere with other tests!
@BeforeClass
public static void beforeTest() throws Exception {
createJetty(TEST_HOME(), "solr/conf/solrconfig-nocache.xml", null);