Author: szetszwo
Date: Sat Jul 11 00:16:35 2009
New Revision: 793155
URL: http://svn.apache.org/viewvc?rev=793155&view=rev
Log:
HADOOP-6141. Fix a few bugs in 0.20 test-patch.sh. Contributed by Hong Tang
Modified:
hadoop/common/branches/branch-0.20/CHANGES.txt
hadoop/common/branches/branch-0.20/src/test/bin/test-patch.sh
Modified: hadoop/common/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/CHANGES.txt?rev=793155&r1=793154&r2=793155&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20/CHANGES.txt Sat Jul 11 00:16:35 2009
@@ -167,6 +167,9 @@
HADOOP-6139. Fix the FsShell help messages for rm and rmr. (Jakob Homan
via szetszwo)
+ HADOOP-6141. Fix a few bugs in 0.20 test-patch.sh. (Hong Tang via
+ szetszwo)
+
Release 0.20.0 - 2009-04-15
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.20/src/test/bin/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/test/bin/test-patch.sh?rev=793155&r1=793154&r2=793155&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/test/bin/test-patch.sh (original)
+++ hadoop/common/branches/branch-0.20/src/test/bin/test-patch.sh Sat Jul 11
00:16:35 2009
@@ -75,7 +75,7 @@
FINDBUGS_HOME=$7
FORREST_HOME=$8
BASEDIR=$9
- JAVA5_HOME=$10
+ JAVA5_HOME=${10}
### Obtain the patch filename to append it to the version number
defect=`basename $PATCH_FILE`
;;
@@ -164,14 +164,14 @@
### echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess=
releaseaudit > $PATCH_DIR/trunkReleaseAuditWarnings.txt 2>&1"
### $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess=
releaseaudit > $PATCH_DIR/trunkReleaseAuditWarnings.txt 2>&1
### fi
- echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint
-Xmaxwarns 1000" $ECLIPSE_PROPERTY -DHadoopPatchProcess= clean tar >
$PATCH_DIR/trunkJavacWarnings.txt 2>&1"
- $ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns
1000" $ECLIPSE_PROPERTY -DHadoopPatchProcess= clean tar >
$PATCH_DIR/trunkJavacWarnings.txt 2>&1
+ echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint
-Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= clean tar >
$PATCH_DIR/trunkJavacWarnings.txt 2>&1"
+ $ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns
1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= clean tar >
$PATCH_DIR/trunkJavacWarnings.txt 2>&1
if [[ $? != 0 ]] ; then
echo "Trunk compilation is broken?"
cleanupAndExit 1
fi
- echo "$ANT_HOME/bin/ant -Dversion="${VERSION}"
-Dfindbugs.home=$FINDBUGS_HOME -DHadoopPatchProcess= findbugs > /dev/null 2>&1"
- $ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME
-DHadoopPatchProcess= findbugs > /dev/null 2>&1
+ echo "$ANT_HOME/bin/ant -Dversion="${VERSION}"
-Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= findbugs > /dev/null 2>&1"
+ $ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME
-Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess=
findbugs > /dev/null 2>&1
if [[ $? != 0 ]] ; then
echo "Trunk findbugs is broken?"
cleanupAndExit 1
@@ -307,8 +307,8 @@
echo "======================================================================"
echo ""
echo ""
- echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint
-Xmaxwarns 1000" $ECLIPSE_PROPERTY -DHadoopPatchProcess= tar >
$PATCH_DIR/patchJavacWarnings.txt 2>&1"
- $ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns
1000" $ECLIPSE_PROPERTY -DHadoopPatchProcess= tar >
$PATCH_DIR/patchJavacWarnings.txt 2>&1
+ echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint
-Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= tar >
$PATCH_DIR/patchJavacWarnings.txt 2>&1"
+ $ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint -Xmaxwarns
1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= tar >
$PATCH_DIR/patchJavacWarnings.txt 2>&1
### Compare trunk and patch javac warning numbers
if [[ -f $PATCH_DIR/patchJavacWarnings.txt ]] ; then
@@ -342,8 +342,8 @@
echo "======================================================================"
echo ""
echo ""
- echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess=
releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1"
- $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= releaseaudit
> $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1
+ echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= releaseaudit >
$PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1"
+ $ANT_HOME/bin/ant -Dversion="${VERSION}" -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= releaseaudit >
$PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1
### Compare trunk and patch release audit warning numbers
if [[ -f $PATCH_DIR/patchReleaseAuditWarnings.txt ]] ; then
@@ -420,8 +420,8 @@
echo "======================================================================"
echo ""
echo ""
- echo "$ANT_HOME/bin/ant -Dversion="${VERSION}"
-Dfindbugs.home=$FINDBUGS_HOME -DHadoopPatchProcess= findbugs"
- $ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME
-DHadoopPatchProcess= findbugs
+ echo "$ANT_HOME/bin/ant -Dversion="${VERSION}"
-Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess= findbugs"
+ $ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME
-Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DHadoopPatchProcess=
findbugs
if [ $? != 0 ] ; then
JIRA_COMMENT="$JIRA_COMMENT
