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 2015/07/31 12:09:29 UTC
svn commit: r1693559 - in /lucene/dev/branches/branch_5x:
lucene/common-build.xml solr/CHANGES.txt solr/common-build.xml
Author: uschindler
Date: Fri Jul 31 10:09:28 2015
New Revision: 1693559
URL: http://svn.apache.org/r1693559
Log:
SOLR-5022: On Java 7 raise permgen for running tests
Modified:
lucene/dev/branches/branch_5x/lucene/common-build.xml
lucene/dev/branches/branch_5x/solr/CHANGES.txt
lucene/dev/branches/branch_5x/solr/common-build.xml
Modified: lucene/dev/branches/branch_5x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/common-build.xml?rev=1693559&r1=1693558&r2=1693559&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/common-build.xml Fri Jul 31 10:09:28 2015
@@ -145,8 +145,6 @@
<isset property="run.clover"/>
</condition>
- <property name="tests.heapdump.args" value=""/>
-
<!-- Override these in your local properties to your desire. -->
<!-- Show simple class names (no package) in test suites. -->
<property name="tests.useSimpleNames" value="false" />
@@ -926,6 +924,9 @@
<property name="tests.dups" value="1" />
<property name="tests.useSecurityManager" value="true" />
+ <property name="tests.heapdump.args" value=""/>
+ <property name="tests.memory.args" value=""/>
+
<!-- turn on security manager? -->
<condition property="java.security.manager" value="org.apache.lucene.util.TestSecurityManager">
<istrue value="${tests.useSecurityManager}"/>
@@ -1007,6 +1008,7 @@
<!-- JVM arguments and system properties. -->
<jvmarg line="${args}"/>
<jvmarg line="${tests.heapdump.args}"/>
+ <jvmarg line="${tests.memory.args}"/>
<jvmarg line="${tests.clover.args}"/>
<jvmarg line="@{additional.vm.args}"/>
<jvmarg line="${tests.asserts.args}"/>
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1693559&r1=1693558&r2=1693559&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Fri Jul 31 10:09:28 2015
@@ -315,6 +315,8 @@ Other Changes
* SOLR-6625: Enable registering interceptors for the calls made using HttpClient and make the
request object available at the interceptor context ( Ishan Chattopadhyaya, Gregory Chanan, noble, Anshum Gupta)
+* SOLR-5022: On Java 7 raise permgen for running tests. (Uwe Schindler)
+
================== 5.2.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
Modified: lucene/dev/branches/branch_5x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/common-build.xml?rev=1693559&r1=1693558&r2=1693559&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/common-build.xml Fri Jul 31 10:09:28 2015
@@ -149,15 +149,16 @@
</macrodef>
<!--
- - We don't test HDFS on Java 7 because it causes permgen errors. Java 8 no longer has permgen.
- - We don't want to run HDFS tests on Windows, because they require Cygwin.
+ We don't want to run HDFS tests on Windows, because they require Cygwin.
If you have Cygwin or manually raised permgen, you can override this property on command line:
-->
<condition property="tests.disableHdfs" value="true">
- <or>
- <equals arg1="${build.java.runtime}" arg2="1.7"/>
- <os family="windows"/>
- </or>
+ <os family="windows"/>
+ </condition>
+
+ <!-- SOLR needs extra PermGen space to run tests, but only on Java 7: -->
+ <condition property="tests.memory.args" value="-XX:MaxPermSize=192m">
+ <equals arg1="${build.java.runtime}" arg2="1.7"/>
</condition>
<target name="validate" depends="compile-tools">