Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the tests.jvms override in some modules so the user (e.g., Jenkins) cannot override it 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1417622 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2012-12-05 20:15:11 +00:00
parent f5fdf9362f
commit 91240881de
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -298,7 +298,7 @@
<antcall> <antcall>
<param name="run.clover" value="true"/> <param name="run.clover" value="true"/>
<!-- must be 1, as clover does not like parallel test runs: --> <!-- 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: --> <!-- Also override some other props to be fast: -->
<param name="tests.multiplier" value="1"/> <param name="tests.multiplier" value="1"/>
<param name="tests.nightly" value="false"/> <param name="tests.nightly" value="false"/>

2
lucene/analysis/uima/build.xml
View File

@ -24,7 +24,7 @@
</description> </description>
<property name="tests.userdir" value="src/test-files"/> <property name="tests.userdir" value="src/test-files"/>
<property name="tests.jvms" value="1" /> <property name="tests.jvms.override" value="1" />
<path id="uimajars"> <path id="uimajars">
<pathelement path="lib/uimaj-core-2.3.1.jar"/> <pathelement path="lib/uimaj-core-2.3.1.jar"/>

2
lucene/benchmark/build.xml
View File

@ -27,7 +27,7 @@
<property name="working.dir" location="work"/> <property name="working.dir" location="work"/>
<!-- the tests have some parallel problems --> <!-- the tests have some parallel problems -->
<property name="tests.jvms" value="1"/> <property name="tests.jvms.override" value="1"/>
<target name="check-files"> <target name="check-files">
<available file="temp/news20.tar.gz" property="news20.exists"/> <available file="temp/news20.tar.gz" property="news20.exists"/>

6
lucene/common-build.xml
View File

@ -82,7 +82,11 @@
<property name="args" value=""/> <property name="args" value=""/>
<property name="tests.seed" 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" value="auto" />
<property name="tests.jvms.override" value="${tests.jvms}" />
<property name="tests.multiplier" value="1" /> <property name="tests.multiplier" value="1" />
<property name="tests.codec" value="random" /> <property name="tests.codec" value="random" />
<property name="tests.postingsformat" value="random" /> <property name="tests.postingsformat" value="random" />
@ -1160,7 +1164,7 @@ ${tests-output}/junit4-*.suites - per-JVM executed suites
jars so we just order it after compile-test to ensure that --> 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"> <target name="test" depends="clover,compile-test,install-junit4-taskdef,validate" description="Runs unit tests">
<mkdir dir="${junit.output.dir}"/> <mkdir dir="${junit.output.dir}"/>
<test-macro threadNum="${tests.jvms}" /> <test-macro threadNum="${tests.jvms.override}" />
</target> </target>
<!-- <!--

2
solr/contrib/dataimporthandler/build.xml
View File

@ -24,7 +24,7 @@
</description> </description>
<!-- the tests have some parallel problems: writability to single copy of dataimport.properties --> <!-- 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"/> <import file="../contrib-build.xml"/>