You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2012/04/15 23:45:11 UTC
svn commit: r1326427 - in /lucene/dev/trunk: lucene/common-build.xml
modules/analysis/uima/build.xml modules/benchmark/build.xml
solr/contrib/dataimporthandler/build.xml
Author: dweiss
Date: Sun Apr 15 21:45:10 2012
New Revision: 1326427
URL: http://svn.apache.org/viewvc?rev=1326427&view=rev
Log:
LUCENE-3808: rename tests.threadspercpu into tests.jvms.
Modified:
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/modules/analysis/uima/build.xml
lucene/dev/trunk/modules/benchmark/build.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1326427&r1=1326426&r2=1326427&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Sun Apr 15 21:45:10 2012
@@ -77,7 +77,7 @@
<property name="args" value=""/>
<property name="tests.seed" value="" />
- <property name="tests.threadspercpu" value="auto" />
+ <property name="tests.jvms" value="auto" />
<property name="tests.multiplier" value="1" />
<property name="tests.codec" value="random" />
<property name="tests.postingsformat" value="random" />
@@ -891,12 +891,12 @@ ant -Dtests.slow=[false] - slow tes
#
# Run sequentially (one slave JVM).
-ant -Dtests.threadspercpu=1 test
+ant -Dtests.jvms=1 test
# Run with more slave JVMs than the default.
# Don't count hypercores for CPU-intense tests.
# Make sure there is enough RAM to handle child JVMs.
-ant -Dtests.threadspercpu=8 test
+ant -Dtests.jvms=8 test
# Use repeatable suite order on slave JVMs (disables job stealing).
ant -Dtests.dynamicAssignmentRatio=0 test
@@ -944,7 +944,7 @@ ${tests-output}/junit4-*.suites - pe
jars so we just order it after compile-test to ensure that -->
<target name="test" depends="compile-test,install-junit4-taskdef,validate" description="Runs unit tests">
<mkdir dir="${junit.output.dir}"/>
- <test-macro threadNum="${tests.threadspercpu}" />
+ <test-macro threadNum="${tests.jvms}" />
</target>
<!--
Modified: lucene/dev/trunk/modules/analysis/uima/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/uima/build.xml?rev=1326427&r1=1326426&r2=1326427&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/uima/build.xml (original)
+++ lucene/dev/trunk/modules/analysis/uima/build.xml Sun Apr 15 21:45:10 2012
@@ -26,7 +26,7 @@
<property name="build.dir" location="../build/uima" />
<property name="dist.dir" location="../dist/uima" />
<property name="tests.userdir" value="src/test-files"/>
- <property name="tests.threadspercpu" value="0" />
+ <property name="tests.jvms" value="1" />
<path id="uimajars">
<pathelement path="lib/uimaj-core-2.3.1.jar"/>
Modified: lucene/dev/trunk/modules/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/build.xml?rev=1326427&r1=1326426&r2=1326427&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/build.xml (original)
+++ lucene/dev/trunk/modules/benchmark/build.xml Sun Apr 15 21:45:10 2012
@@ -31,7 +31,7 @@
<property name="working.dir" location="work"/>
<!-- the tests have some parallel problems -->
- <property name="tests.threadspercpu" value="0"/>
+ <property name="tests.jvms" value="1"/>
<target name="check-files">
<available file="temp/news20.tar.gz" property="news20.exists"/>
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml?rev=1326427&r1=1326426&r2=1326427&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml Sun Apr 15 21:45:10 2012
@@ -24,7 +24,7 @@
</description>
<!-- the tests have some parallel problems: writability to single copy of dataimport.properties -->
- <property name="tests.threadspercpu" value="0"/>
+ <property name="tests.jvms" value="1"/>
<import file="../contrib-build.xml"/>