You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2013/03/25 05:34:29 UTC
svn commit: r1460520 - /hadoop/common/trunk/dev-support/test-patch.sh
Author: szetszwo
Date: Mon Mar 25 04:34:29 2013
New Revision: 1460520
URL: http://svn.apache.org/r1460520
Log:
svn merge -c -1448745 and -1448285 for reverting HADOOP-9112: test-patch should -1 for @Tests without a timeout
Modified:
hadoop/common/trunk/dev-support/test-patch.sh
Modified: hadoop/common/trunk/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/dev-support/test-patch.sh?rev=1460520&r1=1460519&r2=1460520&view=diff
==============================================================================
--- hadoop/common/trunk/dev-support/test-patch.sh (original)
+++ hadoop/common/trunk/dev-support/test-patch.sh Mon Mar 25 04:34:29 2013
@@ -323,7 +323,7 @@ checkAuthor () {
}
###############################################################################
-### Check for tests and their timeout in the patch
+### Check for tests in the patch
checkTests () {
echo ""
echo ""
@@ -357,25 +357,7 @@ checkTests () {
JIRA_COMMENT="$JIRA_COMMENT
{color:green}+1 tests included{color}. The patch appears to include $testReferences new or modified test files."
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Checking if the tests have timeout assigned in this patch."
- echo "======================================================================"
- echo "======================================================================"
-
- nontimeoutTests=`cat $PATCH_DIR/patch | $AWK '{ printf "%s ", $0 }' | $GREP --extended-regex --count '[ ]*\+[ ]*((@Test[\+ ]*[A-Za-z]+)|([\+ ]*@Test[ \+]*\([ \+]*\)[\ ]*\+?[ ]*[A-Za-z]+)|([\+ ]*@Test[\+ ]*\(exception[ \+]*=[ \+]*[A-Z.a-z0-9A-Z ]*\)))'`
-
- if [[ $nontimeoutTests == 0 ]] ; then
- JIRA_COMMENT="$JIRA_COMMENT
-
- {color:green}+1 tests included appear to have a timeout.{color}"
- return 0
- fi
- JIRA_COMMENT="$JIRA_COMMENT
-
- {color:red}-1 one of tests included doesn't have a timeout.{color}"
- return 1
+ return 0
}
cleanUpXml () {