hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkesa...@apache.org
Subject svn commit: r759436 - /hadoop/core/nightly/test-patch/test-patch.sh
Date Sat, 28 Mar 2009 07:31:47 GMT
Author: gkesavan
Date: Sat Mar 28 07:31:46 2009
New Revision: 759436

URL: http://svn.apache.org/viewvc?rev=759436&view=rev
Log:
to fix test-patch.sh for zookeeper patch builds

Modified:
    hadoop/core/nightly/test-patch/test-patch.sh

Modified: hadoop/core/nightly/test-patch/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/core/nightly/test-patch/test-patch.sh?rev=759436&r1=759435&r2=759436&view=diff
==============================================================================
--- hadoop/core/nightly/test-patch/test-patch.sh (original)
+++ hadoop/core/nightly/test-patch/test-patch.sh Sat Mar 28 07:31:46 2009
@@ -81,7 +81,7 @@
       BASEDIR=$9
       JAVA5_HOME=${10}
       PROJECT_NAME=${11}
-      ### Obtain the patch filename to append it to the version number
+      ### Obtain the patch filename to append it to the ver number
       defect=`basename $PATCH_FILE` 
       ;;
     *)
@@ -103,7 +103,7 @@
   echo ""
   echo ""
   ### When run by a developer, if the workspace contains modifications, do not continue
-  #status=`$SVN stat`
+  status=`$SVN stat`
   if [[ $HUDSON == "false" ]] ; then
     if [[ "$status" != "" ]] ; then
       echo "ERROR: can't run in a workspace that contains the following modifications"
@@ -134,17 +134,16 @@
     echo "$defect patch is being downloaded at `date` from"
     echo "$patchURL"
     $WGET -q -O $PATCH_DIR/patch $patchURL
-    VERSION=${SVN_REVISION}_${defect}_PATCH-${patchNum}
     JIRA_COMMENT="Here are the results of testing the latest attachment 
   $patchURL
   against trunk revision ${SVN_REVISION}."
-
-    ### Copy in any supporting files needed by this process
-    cp -r $SUPPORT_DIR/lib/* ./lib
-    #PENDING: cp -f $SUPPORT_DIR/etc/checkstyle* ./src/test
+    if [[ ${PROJECT} == "HADOOP" ]] ; then
+      ### Copy in any supporting files needed by this process
+      cp -r $SUPPORT_DIR/lib/* ./lib
+      #PENDING: cp -f $SUPPORT_DIR/etc/checkstyle* ./src/test
+    fi
   ### Copy the patch file to $PATCH_DIR
   else
-    VERSION=PATCH-${defect}
     cp $PATCH_FILE $PATCH_DIR/patch
     if [[ $? == 0 ]] ; then
       echo "Patch file $PATCH_FILE copied to $PATCH_DIR"
@@ -163,16 +162,16 @@
   echo "======================================================================"
   echo ""
   echo ""
-  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= releaseaudit > $PATCH_DIR/trunkReleaseAuditWarnings.txt
2>&1"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= releaseaudit > $PATCH_DIR/trunkReleaseAuditWarnings.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} -D${PROJECT_NAME}PatchProcess= 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} -D${PROJECT_NAME}PatchProcess= clean
tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
+  echo "$ANT_HOME/bin/ant  -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess=
releaseaudit > $PATCH_DIR/trunkReleaseAuditWarnings.txt 2>&1"
+  $ANT_HOME/bin/ant  -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess=
releaseaudit > $PATCH_DIR/trunkReleaseAuditWarnings.txt 2>&1
+  echo "$ANT_HOME/bin/ant  -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt
2>&1"
+  $ANT_HOME/bin/ant  -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= 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 -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= findbugs > /dev/null 2>&1"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= findbugs > /dev/null 2>&1
+  echo "$ANT_HOME/bin/ant  -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= findbugs > /dev/null 2>&1"
+  $ANT_HOME/bin/ant  -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= findbugs > /dev/null 2>&1
   if [[ $? != 0 ]] ; then
     echo "Trunk findbugs is broken?"
     cleanupAndExit 1
@@ -278,8 +277,8 @@
   echo "======================================================================"
   echo ""
   echo ""
-  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -D${PROJECT_NAME}PatchProcess= clean javadoc
| tee $PATCH_DIR/patchJavadocWarnings.txt"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" -D${PROJECT_NAME}PatchProcess= clean javadoc |
tee $PATCH_DIR/patchJavadocWarnings.txt
+  echo "$ANT_HOME/bin/ant  -D${PROJECT_NAME}PatchProcess= clean javadoc | tee $PATCH_DIR/patchJavadocWarnings.txt"
+  $ANT_HOME/bin/ant  -D${PROJECT_NAME}PatchProcess= clean javadoc | tee $PATCH_DIR/patchJavadocWarnings.txt
   javadocWarnings=`$GREP -c '\[javadoc\] [0-9]* warning' $PATCH_DIR/patchJavadocWarnings.txt`
   echo ""
   echo ""
@@ -308,8 +307,8 @@
   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} -D${PROJECT_NAME}PatchProcess= 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} -D${PROJECT_NAME}PatchProcess= clean
tar > $PATCH_DIR/patchJavacWarnings.txt 2>&1
+  echo "$ANT_HOME/bin/ant  -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt
2>&1"
+  $ANT_HOME/bin/ant  -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt
2>&1
 
   ### Compare trunk and patch javac warning numbers
   if [[ -f $PATCH_DIR/patchJavacWarnings.txt ]] ; then
@@ -343,8 +342,8 @@
   echo "======================================================================"
   echo ""
   echo ""
-  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt
2>&1"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt
2>&1
+  echo "$ANT_HOME/bin/ant  -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess=
releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1"
+  $ANT_HOME/bin/ant  -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess=
releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1
 
   ### Compare trunk and patch release audit warning numbers
   if [[ -f $PATCH_DIR/patchReleaseAuditWarnings.txt ]] ; then
@@ -391,8 +390,8 @@
   echo "THIS IS NOT IMPLEMENTED YET"
   echo ""
   echo ""
-  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -D${PROJECT_NAME}PatchProcess= checkstyle"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" -D${PROJECT_NAME}PatchProcess= checkstyle
+  echo "$ANT_HOME/bin/ant  -D${PROJECT_NAME}PatchProcess= checkstyle"
+  $ANT_HOME/bin/ant  -D${PROJECT_NAME}PatchProcess= 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
@@ -421,8 +420,8 @@
   echo "======================================================================"
   echo ""
   echo ""
-  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= findbugs"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= findbugs
+  echo "$ANT_HOME/bin/ant  -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= findbugs"
+  $ANT_HOME/bin/ant  -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME}
-D${PROJECT_NAME}PatchProcess= findbugs
   if [ $? != 0 ] ; then
     JIRA_COMMENT="$JIRA_COMMENT
 
@@ -476,12 +475,12 @@
   ### Kill any rogue build processes from the last attempt
   $PS -auxwww | $GREP ${PROJECT_NAME}PatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs
-t -I {} /bin/kill -9 {} > /dev/null
   pretestTarget=""
-  if [[ $PROJECT_NAME == "Hadoop" ]] ; then
+  if [[ $PROJECT_NAME == "HADOOP" ]] ; then
      PreTestTarget="create-c++-configure"
   fi   
 
-  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -D${PROJECT_NAME}PatchProcess= -Dtest.junit.output.format=xml
-Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME
$PreTestTarget test-core"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" -D${PROJECT_NAME}PatchProcess= -Dtest.junit.output.format=xml
-Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME
$PreTestTarget test-core
+  echo "$ANT_HOME/bin/ant  -D${PROJECT_NAME}PatchProcess= -Dtest.junit.output.format=xml
-Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME
$PreTestTarget test-core"
+  $ANT_HOME/bin/ant  -D${PROJECT_NAME}PatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes
-Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME $PreTestTarget test-core
   if [[ $? != 0 ]] ; then
     JIRA_COMMENT="$JIRA_COMMENT
 
@@ -498,7 +497,7 @@
 ### Tests parts of contrib specific to the eclipse files
 checkJarFilesDeclaredInEclipse () {
   export DECLARED_JARS=$(sed -n 's@.*kind="lib".*path="\(.*jar\)".*@\1@p' < .eclipse.templates/.classpath)
-  export PRESENT_JARS=$(find build/ivy/lib/Hadoop/common/ lib/ src/test/lib/ -name '*.jar'
|sort)
+  export PRESENT_JARS=$(find build/ivy/lib/adoop/common/ lib/ src/test/lib/ -name '*.jar'
|sort)
   # When run by Hudson, consider libs from ${SUPPORT_DIR} declared
   if [[ ${HUDSON} == "true" ]]; then
       DECLARED_JARS="${DECLARED_JARS} $(cd "${SUPPORT_DIR}"; find lib -name '*.jar')"
@@ -559,8 +558,8 @@
   ### Kill any rogue build processes from the last attempt
   $PS -auxwww | $GREP ${PROJECT_NAME}PatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs
-t -I {} /bin/kill -9 {} > /dev/null
 
-  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY -D${PROJECT_NAME}PatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes test-contrib"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY $PYTHON_PROPERTY -D${PROJECT_NAME}PatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes test-contrib
+  echo "$ANT_HOME/bin/ant  $ECLIPSE_PROPERTY $PYTHON_PROPERTY -D${PROJECT_NAME}PatchProcess=
-Dtest.junit.output.format=xml -Dtest.output=yes test-contrib"
+  $ANT_HOME/bin/ant  $ECLIPSE_PROPERTY $PYTHON_PROPERTY -D${PROJECT_NAME}PatchProcess= -Dtest.junit.output.format=xml
-Dtest.output=yes test-contrib
   if [[ $? != 0 ]] ; then
     JIRA_COMMENT="$JIRA_COMMENT
 



Mime
View raw message