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 2012/12/05 21:15:13 UTC
svn commit: r1417622 - in /lucene/dev/trunk: build.xml
lucene/analysis/uima/build.xml lucene/benchmark/build.xml
lucene/common-build.xml solr/contrib/dataimporthandler/build.xml
Author: uschindler
Date: Wed Dec 5 20:15:11 2012
New Revision: 1417622
URL: http://svn.apache.org/viewvc?rev=1417622&view=rev
Log:
Fix the tests.jvms override in some modules so the user (e.g., Jenkins) cannot override it
Modified:
lucene/dev/trunk/build.xml
lucene/dev/trunk/lucene/analysis/uima/build.xml
lucene/dev/trunk/lucene/benchmark/build.xml
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1417622&r1=1417621&r2=1417622&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Wed Dec 5 20:15:11 2012
@@ -298,7 +298,7 @@
<antcall>
<param name="run.clover" value="true"/>
<!-- must be 1, as clover does not like parallel test runs: -->
- <param name="tests.jvms" value="1"/>
+ <param name="tests.jvms.override" value="1"/>
<!-- Also override some other props to be fast: -->
<param name="tests.multiplier" value="1"/>
<param name="tests.nightly" value="false"/>
Modified: lucene/dev/trunk/lucene/analysis/uima/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/uima/build.xml?rev=1417622&r1=1417621&r2=1417622&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/uima/build.xml (original)
+++ lucene/dev/trunk/lucene/analysis/uima/build.xml Wed Dec 5 20:15:11 2012
@@ -24,7 +24,7 @@
</description>
<property name="tests.userdir" value="src/test-files"/>
- <property name="tests.jvms" value="1" />
+ <property name="tests.jvms.override" value="1" />
<path id="uimajars">
<pathelement path="lib/uimaj-core-2.3.1.jar"/>
Modified: lucene/dev/trunk/lucene/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/build.xml?rev=1417622&r1=1417621&r2=1417622&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/build.xml (original)
+++ lucene/dev/trunk/lucene/benchmark/build.xml Wed Dec 5 20:15:11 2012
@@ -27,7 +27,7 @@
<property name="working.dir" location="work"/>
<!-- the tests have some parallel problems -->
- <property name="tests.jvms" value="1"/>
+ <property name="tests.jvms.override" value="1"/>
<target name="check-files">
<available file="temp/news20.tar.gz" property="news20.exists"/>
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1417622&r1=1417621&r2=1417622&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Wed Dec 5 20:15:11 2012
@@ -82,7 +82,11 @@
<property name="args" value=""/>
<property name="tests.seed" value="" />
+
+ <!-- This is a hack to be able to override the JVM count for special modules that don't like parallel tests: -->
<property name="tests.jvms" value="auto" />
+ <property name="tests.jvms.override" value="${tests.jvms}" />
+
<property name="tests.multiplier" value="1" />
<property name="tests.codec" value="random" />
<property name="tests.postingsformat" value="random" />
@@ -1160,7 +1164,7 @@ ${tests-output}/junit4-*.suites - pe
jars so we just order it after compile-test to ensure that -->
<target name="test" depends="clover,compile-test,install-junit4-taskdef,validate" description="Runs unit tests">
<mkdir dir="${junit.output.dir}"/>
- <test-macro threadNum="${tests.jvms}" />
+ <test-macro threadNum="${tests.jvms.override}" />
</target>
<!--
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml?rev=1417622&r1=1417621&r2=1417622&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml Wed Dec 5 20:15:11 2012
@@ -24,7 +24,7 @@
</description>
<!-- the tests have some parallel problems: writability to single copy of dataimport.properties -->
- <property name="tests.jvms" value="1"/>
+ <property name="tests.jvms.override" value="1"/>
<import file="../contrib-build.xml"/>