HBASE-9991 Addendum reuses output from maven command
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1545878 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
cf05af178a
commit
5e1cb013d4
|
@ -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 + $? ))
|
||||
|
|
Loading…
Reference in New Issue