lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r926687 - in /lucene/dev/nightly: hudson-lucene-trunk.sh hudson-settings.sh hudson-solr-trunk.sh
Date Tue, 23 Mar 2010 18:01:11 GMT
Author: uschindler
Date: Tue Mar 23 18:01:10 2010
New Revision: 926687

URL: http://svn.apache.org/viewvc?rev=926687&view=rev
Log:
update build scripts to remove code duplication, generate xml test reports for hudson and
clean up lucene before the clover build, too

Added:
    lucene/dev/nightly/hudson-settings.sh   (with props)
Modified:
    lucene/dev/nightly/hudson-lucene-trunk.sh
    lucene/dev/nightly/hudson-solr-trunk.sh

Modified: lucene/dev/nightly/hudson-lucene-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-trunk.sh?rev=926687&r1=926686&r2=926687&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-trunk.sh Tue Mar 23 18:01:10 2010
@@ -2,12 +2,9 @@
 set -e
 set -x
 
-ANT_HOME=/export/home/hudson/tools/ant/latest
-SVNVERSION_EXE=/opt/subversion-1.6.9/bin/svnversion
-SVN_EXE=/opt/subversion-1.6.9/bin/svn
-MAVEN_SUPPORT=/export/home/nigel/hudsonSupport/maven
-CLOVER=/export/home/hudson/tools/clover/clover2latest
+. $WORKSPACE/nightly/hudson-settings.sh
 
+# in Lucene this is faked to look like "trunk", in reality its the subfolder lucene of trunk:
 SVN_BRANCH_DIR=trunk
 
 #Update the Version # when doing a release

Added: lucene/dev/nightly/hudson-settings.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-settings.sh?rev=926687&view=auto
==============================================================================
--- lucene/dev/nightly/hudson-settings.sh (added)
+++ lucene/dev/nightly/hudson-settings.sh Tue Mar 23 18:01:10 2010
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+ANT_HOME=/export/home/hudson/tools/ant/latest
+SVNVERSION_EXE=/opt/subversion-1.6.9/bin/svnversion
+SVN_EXE=/opt/subversion-1.6.9/bin/svn
+MAVEN_SUPPORT=/export/home/nigel/hudsonSupport/maven
+CLOVER=/export/home/hudson/tools/clover/clover2latest

Propchange: lucene/dev/nightly/hudson-settings.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: lucene/dev/nightly/hudson-settings.sh
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: lucene/dev/nightly/hudson-solr-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-solr-trunk.sh?rev=926687&r1=926686&r2=926687&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-solr-trunk.sh (original)
+++ lucene/dev/nightly/hudson-solr-trunk.sh Tue Mar 23 18:01:10 2010
@@ -2,15 +2,12 @@
 set -e
 set -x
 
-ANT_HOME=/export/home/hudson/tools/ant/latest
-SVNVERSION_EXE=/opt/subversion-1.6.9/bin/svnversion
-SVN_EXE=/opt/subversion-1.6.9/bin/svn
-MAVEN_SUPPORT=/export/home/nigel/hudsonSupport/maven
-CLOVER=/export/home/hudson/tools/clover/clover2latest
+. $WORKSPACE/nightly/hudson-settings.sh
 
-SVN_BRANCH_DIR=trunk/solr
+SVN_SOLR_BRANCH_DIR=trunk/solr
+SVN_LUCENE_BRANCH_DIR=trunk/lucene
 
-cd $WORKSPACE/$SVN_BRANCH_DIR
+cd $WORKSPACE/$SVN_SOLR_BRANCH_DIR
 
 echo "Workspace: $WORKSPACE"
 
@@ -18,18 +15,26 @@ $ANT_HOME/bin/ant \
   -Dversion=$BUILD_ID \
   -Dsvnversion.exe=$SVNVERSION_EXE \
   -Dsequential-tests=1 \
+  -Djunit.formatter=xml \
   clean nightly
 
 $ANT_HOME/bin/ant \
   -Dversion=$BUILD_ID \
   -lib $MAVEN_SUPPORT \
   -Dsvnversion.exe=$SVNVERSION_EXE \
-  -Dsequential-tests=1 \
   clean generate-maven-artifacts
-  
+
+# just clean up lucene build to also instrument with clover:
+cd $WORKSPACE/$SVN_LUCENE_BRANCH_DIR
+$ANT_HOME/bin/ant clean
+
+# back to solr...
+cd $WORKSPACE/$SVN_SOLR_BRANCH_DIR
+
 ANT_OPTS="-Xmx896M" $ANT_HOME/bin/ant \
   -lib $CLOVER \
   -Drun.clover=true \
   -Dsvnversion.exe=$SVNVERSION_EXE \
   -Dsequential-tests=1 \
+  -Djunit.formatter=xml \
   clean-dest clover test generate-clover-reports



Mime
View raw message