You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2013/11/26 23:46:15 UTC

svn commit: r1545878 - /hbase/trunk/dev-support/test-patch.sh

Author: tedyu
Date: Tue Nov 26 22:46:15 2013
New Revision: 1545878

URL: http://svn.apache.org/r1545878
Log:
HBASE-9991 Addendum reuses output from maven command


Modified:
    hbase/trunk/dev-support/test-patch.sh

Modified: hbase/trunk/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/dev-support/test-patch.sh?rev=1545878&r1=1545877&r2=1545878&view=diff
==============================================================================
--- hbase/trunk/dev-support/test-patch.sh (original)
+++ hbase/trunk/dev-support/test-patch.sh Tue Nov 26 22:46:15 2013
@@ -244,9 +244,9 @@ setup () {
   echo "$MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunkJavacWarnings.txt 2>&1"
   export MAVEN_OPTS="${MAVEN_OPTS}"
   # build core and tests
-  $MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunkJavacWarnings.txt 2>&1 >compile.out
+  $MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
   if [[ $? != 0 ]] ; then
-    ERR=`$GREP -A 5 'Compilation failure' compile.out`
+    ERR=`$GREP -A 5 'Compilation failure' $PATCH_DIR/trunkJavacWarnings.txt`
     echo "Trunk compilation is broken?
     {code}$ERR{code}"
     cleanupAndExit 1
@@ -391,9 +391,9 @@ checkHadoop10Compile () {
 
   export MAVEN_OPTS="${MAVEN_OPTS}"
   # build core and tests
-  $MVN clean test help:active-profiles -X -DskipTests -Dhadoop.profile=1.0 -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunk1.0JavacWarnings.txt 2>&1 >compile.out
+  $MVN clean test help:active-profiles -X -DskipTests -Dhadoop.profile=1.0 -D${PROJECT_NAME}PatchProcess > $PATCH_DIR/trunk1.0JavacWarnings.txt 2>&1
   if [[ $? != 0 ]] ; then
-    ERR=`$GREP -A 5 'Compilation failure' compile.out`
+    ERR=`$GREP -A 5 'Compilation failure' $PATCH_DIR/trunk1.0JavacWarnings.txt`
     JIRA_COMMENT="$JIRA_COMMENT
 
     {color:red}-1 hadoop1.0{color}.  The patch failed to compile against the hadoop 1.0 profile.
@@ -896,7 +896,6 @@ if [[ $? != 0 ]] ; then
 fi
 
 checkAntiPatterns
-trap "rm compile.out" EXIT
 (( RESULT = RESULT + $? ))
 checkHadoop10Compile
 (( RESULT = RESULT + $? ))