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 2014/11/30 00:52:43 UTC
svn commit: r1642488 - in /lucene/dev/trunk: build.xml lucene/CHANGES.txt
lucene/analysis/build.xml lucene/build.xml lucene/common-build.xml
solr/build.xml
Author: uschindler
Date: Sat Nov 29 23:52:42 2014
New Revision: 1642488
URL: http://svn.apache.org/r1642488
Log:
LUCENE-5968: Improve error message when 'ant beast' is run on top-level modules
This closes #96
Modified:
lucene/dev/trunk/build.xml
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/analysis/build.xml
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/solr/build.xml
Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1642488&r1=1642487&r2=1642488&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Sat Nov 29 23:52:42 2014
@@ -68,6 +68,10 @@
</subant>
</target>
+ <target name="beast">
+ <fail message="The Beast only works inside of individual modules"/>
+ </target>
+
<target name="documentation" description="Generate Lucene and Solr Documentation">
<subant target="documentation" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1642488&r1=1642487&r2=1642488&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Sat Nov 29 23:52:42 2014
@@ -313,6 +313,9 @@ Tests
Some of the slow Monster tests now explicitly choose the default codec.
(Mike McCandless, Shawn Heisey)
+* LUCENE-5968: Improve error message when 'ant beast' is run on top-level
+ modules. (Ramkumar Aiyengar, Uwe Schindler)
+
Optimizations
* LUCENE-5960: Use a more efficient bitset, not a Set<Integer>, to
Modified: lucene/dev/trunk/lucene/analysis/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/build.xml?rev=1642488&r1=1642487&r2=1642488&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/build.xml (original)
+++ lucene/dev/trunk/lucene/analysis/build.xml Sat Nov 29 23:52:42 2014
@@ -105,6 +105,9 @@
<target name="test">
<forall-analyzers target="test"/>
</target>
+ <target name="beast">
+ <fail message="The Beast only works inside of individual modules"/>
+ </target>
<target name="jar">
<forall-analyzers target="jar-core"/>
</target>
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1642488&r1=1642487&r2=1642488&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Sat Nov 29 23:52:42 2014
@@ -60,6 +60,10 @@
description="Runs pitests (core, modules and back-compat)"
/>
+ <target name="beast">
+ <fail message="The Beast only works inside of individual modules"/>
+ </target>
+
<target name="compile-core" depends="compile-lucene-core"/>
<!-- lucene/test-framework is excluded from compilation -->
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1642488&r1=1642487&r2=1642488&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Sat Nov 29 23:52:42 2014
@@ -1351,6 +1351,11 @@ ${tests-output}/junit4-*.suites - pe
<!-- Beast the actual tests (must be wrapped with -init-totals, -check-totals) -->
<target name="-beast" depends="resolve-groovy">
+ <fail message="The Beast only works inside of individual modules (where 'junit.classpath' is defined)">
+ <condition>
+ <not><isreference refid="junit.classpath"/></not>
+ </condition>
+ </fail>
<groovy taskname="beaster"><![CDATA[
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildLogger;
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1642488&r1=1642487&r2=1642488&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Sat Nov 29 23:52:42 2014
@@ -133,6 +133,9 @@
depends="-clover.load, test-solr-core, test-solrj"/>
<target name="pitest" description="Validate, then run core, solrj, and contrib unit tests."
depends="pitest-core, pitest-contrib"/>
+ <target name="beast">
+ <fail message="The Beast only works inside of individual modules"/>
+ </target>
<target name="compile-test" description="Compile core, solrj, and contrib unit tests, and solr-test-framework."
depends="compile-solr-test-framework, compile-test-solr-core, compile-test-solrj, compile-test-contrib"/>
<target name="javadocs" description="Calls javadocs-all, javadocs-solrj, and javadocs-test-framework"