You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2011/01/27 11:10:36 UTC
svn commit: r1064068 - in /lucene/dev/trunk: dev-tools/testjar/
dev-tools/testjar/testfiles lucene/build.xml lucene/common-build.xml
Author: shaie
Date: Thu Jan 27 10:10:36 2011
New Revision: 1064068
URL: http://svn.apache.org/viewvc?rev=1064068&view=rev
Log:
LUCENE-2609: Generate jar containing test classes (trunk)
Added:
lucene/dev/trunk/dev-tools/testjar/
- copied from r1064066, lucene/dev/branches/branch_3x/dev-tools/testjar/
lucene/dev/trunk/dev-tools/testjar/testfiles
- copied, changed from r1064066, lucene/dev/branches/branch_3x/dev-tools/testjar/testfiles
Modified:
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/common-build.xml
Copied: lucene/dev/trunk/dev-tools/testjar/testfiles (from r1064066, lucene/dev/branches/branch_3x/dev-tools/testjar/testfiles)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/testjar/testfiles?p2=lucene/dev/trunk/dev-tools/testjar/testfiles&p1=lucene/dev/branches/branch_3x/dev-tools/testjar/testfiles&r1=1064066&r2=1064068&rev=1064068&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/testjar/testfiles (original)
+++ lucene/dev/trunk/dev-tools/testjar/testfiles Thu Jan 27 10:10:36 2011
@@ -4,13 +4,21 @@ core.test.files=\
org/apache/lucene/util/LuceneJUnitDividingSelector.java,\
org/apache/lucene/util/LuceneJUnitResultFormatter.java,\
org/apache/lucene/util/LuceneTestCase.java,\
+ org/apache/lucene/util/automaton/AutomatonTestUtil.java,\
org/apache/lucene/search/QueryUtils.java,\
org/apache/lucene/analysis/BaseTokenStreamTestCase.java,\
org/apache/lucene/analysis/MockAnalyzer.java,\
+ org/apache/lucene/analysis/MockPayloadAnalyzer.java,\
+ org/apache/lucene/analysis/MockTokenFilter.java,\
+ org/apache/lucene/analysis/MockTokenizer.java,\
org/apache/lucene/index/MockIndexInput.java,\
org/apache/lucene/index/RandomIndexWriter.java,\
org/apache/lucene/index/DocHelper.java,\
+ org/apache/lucene/codecs/preflexrw/PreFlexFieldsWriter.java,\
+ org/apache/lucene/codecs/preflexrw/PreFlexRWCodec.java,\
+ org/apache/lucene/codecs/preflexrw/TermInfosWriter.java,\
+ org/apache/lucene/codecs/mockrandom/MockRandomCodec.java,\
org/apache/lucene/store/_TestHelper.java,\
org/apache/lucene/store/MockDirectoryWrapper.java,\
org/apache/lucene/store/MockIndexInputWrapper.java,\
- org/apache/lucene/store/MockIndexOutputWrapper.java,\
\ No newline at end of file
+ org/apache/lucene/store/MockIndexOutputWrapper.java,\
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1064068&r1=1064067&r2=1064068&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Thu Jan 27 10:10:36 2011
@@ -618,4 +618,16 @@
</rat:report>
</target>
+ <target name="jar-core-test" depends="compile-test">
+ <!-- load the list of test files into a property named core.test.files -->
+ <property file="../dev-tools/testjar/testfiles" />
+ <!-- copy the files so that we can compile and include both .java and .class in the jar -->
+ <copy todir="${build.dir}/testjar" >
+ <fileset dir="src/test" includes="${core.test.files}" />
+ </copy>
+ <compile-test-macro srcdir="${build.dir}/testjar" destdir="${build.dir}/testjar"
+ test.classpath="test.classpath"/>
+ <jarify basedir="${build.dir}/testjar" destfile="${build.dir}/${final.name}-tests.jar"/>
+ </target>
+
</project>
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1064068&r1=1064067&r2=1064068&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Thu Jan 27 10:10:36 2011
@@ -308,10 +308,6 @@
<jarify/>
</target>
- <target name="jar-core-test" depends="compile-test">
- <jarify basedir="${build.dir}/classes/test" destfile="${build.dir}/${final.name}-tests.jar"/>
- </target>
-
<target name="maven.ant.tasks-check">
<fail unless="maven.ant.tasks.present">
##################################################################