diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 7435365fce9..673f8ddd48d 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -311,7 +311,7 @@ checkTests () { echo "======================================================================" echo "" echo "" - testReferences=`$GREP -c -i '/test' $PATCH_DIR/patch` + testReferences=`$GREP -c -i -e '^+++.*/test' $PATCH_DIR/patch` echo "There appear to be $testReferences test files referenced in the patch." if [[ $testReferences == 0 ]] ; then if [[ $JENKINS == "true" ]] ; then @@ -333,7 +333,7 @@ checkTests () { fi JIRA_COMMENT="$JIRA_COMMENT - +1 tests included. The patch appears to include $testReferences new or modified tests." + +1 tests included. The patch appears to include $testReferences new or modified test files." return 0 } diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 167508b1810..8e0f2c3db97 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -55,6 +55,9 @@ Trunk (unreleased changes) HADOOP-8244. Improve comments on ByteBufferReadable.read. (Henry Robinson via atm) + HADOOP-7757. Test file reference count is at least 3x actual value (Jon + Eagles via bobby) + BUG FIXES HADOOP-8177. MBeans shouldn't try to register when it fails to create MBeanName.