Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverting the change r1102914 for HADOOP-7291 to fix build issues. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1103815 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2011-05-16 17:59:34 +00:00
parent 1e0cc178c7
commit a97d6d9cf0
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -686,8 +686,6 @@ Release 0.22.0 - Unreleased
HADOOP-7068. Ivy resolve force mode should be turned off by default. HADOOP-7068. Ivy resolve force mode should be turned off by default.
(Luke Lu via tomwhite) (Luke Lu via tomwhite)
HADOOP-7291. Update Hudson job not to run test-contrib. (nigel via eli)
Release 0.21.1 - Unreleased Release 0.21.1 - Unreleased
IMPROVEMENTS IMPROVEMENTS

1
build.xml
View File

@ -1520,6 +1520,7 @@
<arg value="${findbugs.home}"/> <arg value="${findbugs.home}"/>
<arg value="${forrest.home}"/> <arg value="${forrest.home}"/>
<arg value="${eclipse.home}"/> <arg value="${eclipse.home}"/>
<arg value="${python.home}"/>
<arg value="${basedir}"/> <arg value="${basedir}"/>
<arg value="${jira.passwd}"/> <arg value="${jira.passwd}"/>
<arg value="${curl.cmd}"/> <arg value="${curl.cmd}"/>

25
src/test/bin/test-patch.sh
View File

@ -26,8 +26,8 @@ parseArgs() {
HUDSON) HUDSON)
### Set HUDSON to true to indicate that this script is being run by Hudson ### Set HUDSON to true to indicate that this script is being run by Hudson
HUDSON=true HUDSON=true
if [[ $# != 16 ]] ; then if [[ $# != 17 ]] ; then
echo "ERROR: usage $0 HUDSON <PATCH_DIR> <SUPPORT_DIR> <PS_CMD> <WGET_CMD> <JIRACLI> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <ECLIPSE_HOME> <WORKSPACE_BASEDIR> <JIRA_PASSWD> <CURL_CMD> <DEFECT> " echo "ERROR: usage $0 HUDSON <PATCH_DIR> <SUPPORT_DIR> <PS_CMD> <WGET_CMD> <JIRACLI> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <ECLIPSE_HOME> <PYTHON_HOME> <WORKSPACE_BASEDIR> <JIRA_PASSWD> <CURL_CMD> <DEFECT> "
cleanupAndExit 0 cleanupAndExit 0
fi fi
PATCH_DIR=$2 PATCH_DIR=$2
@ -41,10 +41,11 @@ parseArgs() {
FINDBUGS_HOME=${10} FINDBUGS_HOME=${10}
FORREST_HOME=${11} FORREST_HOME=${11}
ECLIPSE_HOME=${12} ECLIPSE_HOME=${12}
BASEDIR=${13} PYTHON_HOME=${13}
JIRA_PASSWD=${14} BASEDIR=${14}
CURL=${15} JIRA_PASSWD=${15}
defect=${16} CURL=${16}
defect=${17}
### Retrieve the defect number ### Retrieve the defect number
if [ -z "$defect" ] ; then if [ -z "$defect" ] ; then
@ -57,6 +58,7 @@ parseArgs() {
fi fi
ECLIPSE_PROPERTY="-Declipse.home=$ECLIPSE_HOME" ECLIPSE_PROPERTY="-Declipse.home=$ECLIPSE_HOME"
PYTHON_PROPERTY="-Dpython.home=$PYTHON_HOME"
;; ;;
DEVELOPER) DEVELOPER)
### Set HUDSON to false to indicate that this script is being run by a developer ### Set HUDSON to false to indicate that this script is being run by a developer
@ -524,16 +526,11 @@ runContribTests () {
echo "" echo ""
echo "" echo ""
if [[ `$GREP -c 'test-contrib' build.xml` == 0 ]] ; then
echo "No contrib tests in this project."
return 0
fi
### Kill any rogue build processes from the last attempt ### Kill any rogue build processes from the last attempt
$PS auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null $PS auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no test-contrib" echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no test-contrib"
$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no test-contrib $ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no test-contrib
if [[ $? != 0 ]] ; then if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT JIRA_COMMENT="$JIRA_COMMENT
@ -642,8 +639,6 @@ cleanupAndExit () {
############################################################################### ###############################################################################
############################################################################### ###############################################################################
runContribTests
JIRA_COMMENT="" JIRA_COMMENT=""
JIRA_COMMENT_FOOTER="Console output: $BUILD_URL/console JIRA_COMMENT_FOOTER="Console output: $BUILD_URL/console