This is an automated email from the ASF dual-hosted git repository.
aw pushed a commit to tag prehistory
in repository https://gitbox.apache.org/repos/asf/yetus.git
commit 541033a16c77dd33d759fec0264d35c9d856976e
Author: Nigel Daley <ni...@apache.org>
AuthorDate: Thu Sep 18 16:58:12 2008 +0000
HADOOP-4200. Fix a bug in the test-patch.sh script. Contributed by Ramya R
git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@696707
13f79535-47bb-0310-9956-ffa450edef68
---
src/test/bin/test-patch.sh | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/test/bin/test-patch.sh b/src/test/bin/test-patch.sh
index 2b3adfd4..abdc493f 100755
--- a/src/test/bin/test-patch.sh
+++ b/src/test/bin/test-patch.sh
@@ -159,17 +159,17 @@ setup () {
### DISABLE RELEASE AUDIT UNTIL HADOOP-4074 IS FIXED
### Do not call releaseaudit when run by a developer
### if [[ $HUDSON == "true" ]] ; then
- ### CMD="$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess=
releaseaudit &> $PATCH_DIR/trunkReleaseAuditWarnings.txt"
- ### echo $CMD ; $CMD
+ ### 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
- CMD="$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint
-Xmaxwarns 1000" $ECLIPSE_PROPERTY -DHadoopPatchProcess= clean tar &>
$PATCH_DIR/trunkJavacWarnings.txt"
- echo $CMD ; $CMD
+ 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
if [[ $? != 0 ]] ; then
echo "Trunk compilation is broken?"
cleanupAndExit 1
fi
- CMD="$ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME
-DHadoopPatchProcess= findbugs &> /dev/null"
- echo $CMD ; $CMD
+ 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
if [[ $? != 0 ]] ; then
echo "Trunk findbugs is broken?"
cleanupAndExit 1
@@ -275,8 +275,8 @@ checkJavadocWarnings () {
echo "======================================================================"
echo ""
echo ""
- CMD="$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= clean
javadoc | tee $PATCH_DIR/patchJavadocWarnings.txt"
- echo $CMD ; $CMD
+ echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= clean
javadoc | tee $PATCH_DIR/patchJavadocWarnings.txt"
+ $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= clean javadoc
| tee $PATCH_DIR/patchJavadocWarnings.txt
javadocWarnings=`$GREP -c '\[javadoc\] [0-9]* warning'
$PATCH_DIR/patchJavadocWarnings.txt`
echo ""
echo ""
@@ -305,8 +305,8 @@ checkJavacWarnings () {
echo "======================================================================"
echo ""
echo ""
- CMD="$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djavac.args="-Xlint
-Xmaxwarns 1000" $ECLIPSE_PROPERTY -DHadoopPatchProcess= tar &>
$PATCH_DIR/patchJavacWarnings.txt"
- echo $CMD ; $CMD
+ 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
### Compare trunk and patch javac warning numbers
if [[ -f $PATCH_DIR/patchJavacWarnings.txt ]] ; then
@@ -340,8 +340,8 @@ checkReleaseAuditWarnings () {
echo "======================================================================"
echo ""
echo ""
- CMD="$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess=
releaseaudit &> $PATCH_DIR/patchReleaseAuditWarnings.txt"
- echo $CMD ; $CMD
+ 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
### Compare trunk and patch release audit warning numbers
if [[ -f $PATCH_DIR/patchReleaseAuditWarnings.txt ]] ; then
@@ -388,8 +388,8 @@ checkStyle () {
echo "THIS IS NOT IMPLEMENTED YET"
echo ""
echo ""
- CMD="$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess=
checkstyle"
- echo $CMD ; $CMD
+ echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess=
checkstyle"
+ $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= checkstyle
JIRA_COMMENT_FOOTER="Checkstyle results:
http://hudson.zones.apache.org/hudson/job/$JOB_NAME/$BUILD_NUMBER/artifact/trunk/build/test/checkstyle-errors.html
$JIRA_COMMENT_FOOTER"
### TODO: calculate actual patchStyleErrors
@@ -418,8 +418,8 @@ checkFindbugsWarnings () {
echo "======================================================================"
echo ""
echo ""
- CMD="$ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME
-DHadoopPatchProcess= findbugs"
- echo $CMD ; $CMD
+ 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
if [ $? != 0 ] ; then
JIRA_COMMENT="$JIRA_COMMENT
@@ -473,8 +473,8 @@ runCoreTests () {
### 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
- CMD="$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME create-c++-configure docs
tar test-core"
- echo $CMD ; $CMD
+ echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME create-c++-configure docs
tar test-core"
+ $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes
-Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME create-c++-configure docs
tar test-core
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
@@ -529,8 +529,8 @@ runContribTests () {
### 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
- CMD="$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY
$PYTHON_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml
-Dtest.output=yes test-contrib && runContribTestOnEclipseFiles"
- echo $CMD ; $CMD
+ echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY
$PYTHON_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml
-Dtest.output=yes test-contrib && runContribTestOnEclipseFiles"
+ $ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY
-DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes
test-contrib && runContribTestOnEclipseFiles
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
