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/07/14 09:25:34 UTC

svn commit: r1361482 - in /lucene/dev/nightly: hudson-lucene-4x.sh hudson-lucene-trunk.sh hudson-settings.sh hudson-solr-4x.sh hudson-solr-trunk.sh

Author: uschindler
Date: Sat Jul 14 07:25:33 2012
New Revision: 1361482

URL: http://svn.apache.org/viewvc?rev=1361482&view=rev
Log:
Change clover options (LUCENE-4217).

Modified:
    lucene/dev/nightly/hudson-lucene-4x.sh
    lucene/dev/nightly/hudson-lucene-trunk.sh
    lucene/dev/nightly/hudson-settings.sh
    lucene/dev/nightly/hudson-solr-4x.sh
    lucene/dev/nightly/hudson-solr-trunk.sh

Modified: lucene/dev/nightly/hudson-lucene-4x.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-4x.sh?rev=1361482&r1=1361481&r2=1361482&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-4x.sh (original)
+++ lucene/dev/nightly/hudson-lucene-4x.sh Sat Jul 14 07:25:33 2012
@@ -41,8 +41,8 @@ $ANT_HOME/bin/ant validate
 #Rerun testsuite with clover on
 set +e
 cd $WORKSPACE/$CORE_DIR
-$ANT_HOME/bin/ant \
-  -lib $CLOVER \
+ANT_OPTS="-Xmx512m -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=128M" \
+  $ANT_HOME/bin/ant \
   -Dsvnversion.exe=$SVNVERSION_EXE \
   -Dsvn.exe=$SVN_EXE \
   -Dversion=$VERSION \
@@ -55,9 +55,7 @@ RET=$?
 set -e
 
 #generate the clover reports and javadocs even when tests failed before
-cd $WORKSPACE/$CORE_DIR
 ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
-  -lib $CLOVER \
   -Dsvnversion.exe=$SVNVERSION_EXE \
   -Dsvn.exe=$SVN_EXE \
   -Dversion=$VERSION \

Modified: lucene/dev/nightly/hudson-lucene-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-trunk.sh?rev=1361482&r1=1361481&r2=1361482&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-trunk.sh Sat Jul 14 07:25:33 2012
@@ -41,8 +41,8 @@ $ANT_HOME/bin/ant validate
 #Rerun testsuite with clover on
 set +e
 cd $WORKSPACE/$CORE_DIR
-$ANT_HOME/bin/ant \
-  -lib $CLOVER \
+ANT_OPTS="-Xmx512m -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=128M" \
+  $ANT_HOME/bin/ant \
   -Dsvnversion.exe=$SVNVERSION_EXE \
   -Dsvn.exe=$SVN_EXE \
   -Dversion=$VERSION \
@@ -55,9 +55,7 @@ RET=$?
 set -e
 
 #generate the clover reports and javadocs even when tests failed before
-cd $WORKSPACE/$CORE_DIR
 ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
-  -lib $CLOVER \
   -Dsvnversion.exe=$SVNVERSION_EXE \
   -Dsvn.exe=$SVN_EXE \
   -Dversion=$VERSION \

Modified: lucene/dev/nightly/hudson-settings.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-settings.sh?rev=1361482&r1=1361481&r2=1361482&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-settings.sh (original)
+++ lucene/dev/nightly/hudson-settings.sh Sat Jul 14 07:25:33 2012
@@ -10,7 +10,6 @@ fi
 
 SVNVERSION_EXE=$HOME/tools/svn/svnversion
 SVN_EXE=$HOME/tools/svn/svn
-CLOVER=$HOME/tools/clover/clover2latest
 
 # locations of javadocs used by the build
 JAVADOC_HOME=$HOME/tools/java/api6

Modified: lucene/dev/nightly/hudson-solr-4x.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-solr-4x.sh?rev=1361482&r1=1361481&r2=1361482&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-solr-4x.sh (original)
+++ lucene/dev/nightly/hudson-solr-4x.sh Sat Jul 14 07:25:33 2012
@@ -37,17 +37,19 @@ $ANT_HOME/bin/ant clean
 # back to solr...
 cd $WORKSPACE/$SOLR_DIR
 
-ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
+#Rerun testsuite with clover on
+ANT_OPTS="-Xmx896m -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=128M" \
+  $ANT_HOME/bin/ant \
   -Dversion=$VERSION \
   -Dlucene_version=$VERSION \
-  -lib $CLOVER \
-  -Drun.clover=true \
   -Dsvnversion.exe=$SVNVERSION_EXE \
   -Dsvn.exe=$SVN_EXE \
   -Dtests.jvms=1 \
   -Djunit.formatter=xml \
-  -Dargs="$TEST_JVM_ARGS" \
-  clean-dest clover test generate-clover-reports
+  -Drun.clover=true \
+  -Dtests.jvms=1 \
+  -Dargs="$TEST_JVM_ARGS -XX:ReservedCodeCacheSize=128m" \
+  clean-dest test generate-clover-reports
 
 #checkout should be clean after running tests
 set +e

Modified: lucene/dev/nightly/hudson-solr-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-solr-trunk.sh?rev=1361482&r1=1361481&r2=1361482&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-solr-trunk.sh (original)
+++ lucene/dev/nightly/hudson-solr-trunk.sh Sat Jul 14 07:25:33 2012
@@ -37,17 +37,19 @@ $ANT_HOME/bin/ant clean
 # back to solr...
 cd $WORKSPACE/$SOLR_DIR
 
-ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
+#Rerun testsuite with clover on
+ANT_OPTS="-Xmx896m -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=128M" \
+  $ANT_HOME/bin/ant \
   -Dversion=$VERSION \
   -Dlucene_version=$VERSION \
-  -lib $CLOVER \
-  -Drun.clover=true \
   -Dsvnversion.exe=$SVNVERSION_EXE \
   -Dsvn.exe=$SVN_EXE \
   -Dtests.jvms=1 \
   -Djunit.formatter=xml \
-  -Dargs="$TEST_JVM_ARGS" \
-  clean-dest clover test generate-clover-reports
+  -Drun.clover=true \
+  -Dtests.jvms=1 \
+  -Dargs="$TEST_JVM_ARGS -XX:ReservedCodeCacheSize=128m" \
+  clean-dest test generate-clover-reports
 
 #checkout should be clean after running tests
 set +e