Author: nigel
Date: Thu Dec 20 10:32:48 2007
New Revision: 605991
URL: http://svn.apache.org/viewvc?rev=605991&view=rev
Log:
added forrest.home to ant command line when running docs target
Modified:
lucene/hadoop/nightly/hudsonBuildHadoopNightly.sh
lucene/hadoop/nightly/hudsonBuildHadoopPatch.sh
Modified: lucene/hadoop/nightly/hudsonBuildHadoopNightly.sh
URL:
http://svn.apache.org/viewvc/lucene/hadoop/nightly/hudsonBuildHadoopNightly.sh?rev=605991&r1=605990&r2=605991&view=diff
==============================================================================
--- lucene/hadoop/nightly/hudsonBuildHadoopNightly.sh (original)
+++ lucene/hadoop/nightly/hudsonBuildHadoopNightly.sh Thu Dec 20 10:32:48 2007
@@ -6,11 +6,14 @@
baseDir=/export/home/hudson/hudson/jobs/Hadoop-Nightly
trunk=$baseDir/workspace/trunk
+FORREST_HOME=$HUDSON_HOME/../tools/forrest/latest
+FINDBUGS_HOME=$HUDSON_HOME/../tools/findbugs/latest
+
cd $trunk
### tar target is included in findbugs target
### run this first before instrumenting classes
-$ANT_HOME/bin/ant -Dversion=$BUILD_ID
-Dfindbugs.home=$HUDSON_HOME/../tools/findbugs/latest clean docs findbugs
+$ANT_HOME/bin/ant -Dversion=$BUILD_ID -Dfindbugs.home=$FINDBUGS_HOME
-Dforrest.home=$FORREST_HOME clean docs findbugs
RESULT=$?
if [ $RESULT != 0 ] ; then
echo "Build Failed: remaining tests not run"
Modified: lucene/hadoop/nightly/hudsonBuildHadoopPatch.sh
URL:
http://svn.apache.org/viewvc/lucene/hadoop/nightly/hudsonBuildHadoopPatch.sh?rev=605991&r1=605990&r2=605991&view=diff
==============================================================================
--- lucene/hadoop/nightly/hudsonBuildHadoopPatch.sh (original)
+++ lucene/hadoop/nightly/hudsonBuildHadoopPatch.sh Thu Dec 20 10:32:48 2007
@@ -9,7 +9,8 @@
PATCH=/usr/local/bin/patch
PS=/usr/ucb/ps
JIRA=/export/home/hudson/tools/jira_cli/src/cli/jira
-FINDBUGS_HOME=/export/home/hudson/tools/findbugs/latest
+FINDBUGS_HOME=$HUDSON_HOME/../tools/findbugs/latest
+FORREST_HOME=$HUDSON_HOME/../tools/forrest/latest
###############################################################################
setup () {
@@ -270,7 +271,7 @@
### Kill any rogue build processes from the last attempt
$PS -auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' |
/usr/bin/xargs -t -I {} /usr/bin/kill -9 {} > /dev/null
- $ANT_HOME/bin/ant -Dversion=${revisionNum}_${defect}_PATCH-${patchNum}
-DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes
-Dcompile.c++=yes create-c++-configure docs tar test-core
+ $ANT_HOME/bin/ant -Dversion=${revisionNum}_${defect}_PATCH-${patchNum}
-DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes
-Dcompile.c++=yes -Dforrest.home=$FORREST_HOME create-c++-configure docs tar
test-core
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
