You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by jh...@apache.org on 2014/05/21 06:25:15 UTC
git commit: TAJO-808: Fix pre-commit build failure. (jinho)
Repository: tajo
Updated Branches:
refs/heads/master e7051ef34 -> 618faa242
TAJO-808: Fix pre-commit build failure. (jinho)
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/618faa24
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/618faa24
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/618faa24
Branch: refs/heads/master
Commit: 618faa242ee0f24bc7e4b879b542b94e0f7ce357
Parents: e7051ef
Author: jinossy <ji...@gmail.com>
Authored: Wed May 21 13:24:51 2014 +0900
Committer: jinossy <ji...@gmail.com>
Committed: Wed May 21 13:24:51 2014 +0900
----------------------------------------------------------------------
CHANGES | 2 ++
dev-support/test-patch.sh | 42 ++++++++++++++++++++++++++++++++++--------
2 files changed, 36 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/618faa24/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 26f3f9a..b94f59c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,6 +40,8 @@ Release 0.9.0 - unreleased
(Hyoungjun Kim via hyunsik)
BUG FIXES
+
+ TAJO-808: Fix pre-commit build failure. (jinho)
TAJO-827: SUM() overflow in the case of INT4. (Hyoungjun Kim via hyunsik)
http://git-wip-us.apache.org/repos/asf/tajo/blob/618faa24/dev-support/test-patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index 1a5c247..1978e36 100644
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -299,7 +299,7 @@ verifyPatch () {
}
###############################################################################
-buildTrunk () {
+preBuildTrunk () {
echo ""
echo ""
echo "======================================================================"
@@ -324,6 +324,31 @@ buildTrunk () {
}
###############################################################################
+buildTrunk () {
+ echo ""
+ echo ""
+ echo "======================================================================"
+ echo "======================================================================"
+ echo " Build patch to verify the stability and javac, javadoc warnings"
+ echo "======================================================================"
+ echo "======================================================================"
+ echo ""
+ echo ""
+ echo "Compiling $(pwd)"
+ echo "$MVN clean test -DskipTests $TAJO_MVN_OPTS > $PATCH_DIR/trunkJavacWarnings.txt 2>&1"
+ $MVN clean test -DskipTests $TAJO_MVN_OPTS > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
+ if [[ $? != 0 ]] ; then
+ echo "Trunk compilation is broken?"
+ cleanupAndExit 1
+ fi
+
+ echo ""
+ echo "Generating Javadocs"
+ echo "$MVN test javadoc:javadoc -DskipTests $TAJO_MVN_OPTS > $PATCH_DIR/trunkJavadocsWarnings.txt 2>&1"
+ $MVN test javadoc:javadoc -DskipTests $TAJO_MVN_OPTS > $PATCH_DIR/trunkJavadocWarnings.txt 2>&1
+}
+
+###############################################################################
### Check for @author tags in the patch
checkAuthor () {
echo ""
@@ -853,6 +878,7 @@ if [[ $JENKINS == "true" ]] ; then
exit 100
fi
fi
+preBuildTrunk
downloadPatch
verifyPatch
PLEVEL=$?
@@ -860,6 +886,13 @@ if [[ $PLEVEL == -1 ]] ; then
submitJiraComment 1
cleanupAndExit 1
fi
+applyPatch $PLEVEL
+APPLY_PATCH_RET=$?
+(( RESULT = RESULT + $APPLY_PATCH_RET ))
+if [[ $APPLY_PATCH_RET != 0 ]] ; then
+ submitJiraComment 1
+ cleanupAndExit 1
+fi
buildTrunk
checkAuthor
@@ -868,13 +901,6 @@ if [[ $JENKINS == "true" ]] ; then
fi
checkTests
(( RESULT = RESULT + $? ))
-applyPatch $PLEVEL
-APPLY_PATCH_RET=$?
-(( RESULT = RESULT + $APPLY_PATCH_RET ))
-if [[ $APPLY_PATCH_RET != 0 ]] ; then
- submitJiraComment 1
- cleanupAndExit 1
-fi
checkJavacWarnings
JAVAC_RET=$?
#2 is returned if the code could not compile