Author: szetszwo
Date: Tue Aug 4 19:01:51 2009
New Revision: 800919
URL: http://svn.apache.org/viewvc?rev=800919&view=rev
Log:
HADOOP-6124. Fix javac warning detection in test-patch.sh. Contributed by
Giridharan Kesavan
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/src/test/bin/test-patch.sh
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=800919&r1=800918&r2=800919&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Tue Aug 4 19:01:51 2009
@@ -902,6 +902,9 @@
HADOOP-6172. Fix jar file names in hadoop-config.sh and include
${build.src}
as a part of the source list in build.xml. (Hong Tang via szetszwo)
+ HADOOP-6124. Fix javac warning detection in test-patch.sh. (Giridharan
+ Kesavan via szetszwo)
+
Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/src/test/bin/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/bin/test-patch.sh?rev=800919&r1=800918&r2=800919&view=diff
==============================================================================
--- hadoop/common/trunk/src/test/bin/test-patch.sh (original)
+++ hadoop/common/trunk/src/test/bin/test-patch.sh Tue Aug 4 19:01:51 2009
@@ -307,9 +307,14 @@
echo "======================================================================"
echo ""
echo ""
- 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
+ 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/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= clean tar >
$PATCH_DIR/patchJavacWarnings.txt 2>&1
+ if [[ $? != 0 ]] ; then
+ JIRA_COMMENT="$JIRA_COMMENT
+ -1 javac. The patch appears to cause tar ant target to fail."
+ return 1
+ fi
### Compare trunk and patch javac warning numbers
if [[ -f $PATCH_DIR/patchJavacWarnings.txt ]] ; then
trunkJavacWarnings=`$GREP -o '\[javac\] [0-9]* warning'
$PATCH_DIR/trunkJavacWarnings.txt | awk '{total += $2} END {print total}'`
