Repository: hadoop Updated Branches: refs/heads/HADOOP-12111 174900da1 -> 04039ab15
HADOOP-12312. Findbugs HTML report link shows 0 warnings despite errors (Kengo Seki via busbey) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/04039ab1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/04039ab1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/04039ab1 Branch: refs/heads/HADOOP-12111 Commit: 04039ab1501ab17bfd4e6e587559ea09d1eeb674 Parents: 174900d Author: Sean Busbey <[email protected]> Authored: Fri Sep 4 09:16:42 2015 -0500 Committer: Sean Busbey <[email protected]> Committed: Fri Sep 4 09:17:09 2015 -0500 ---------------------------------------------------------------------- dev-support/test-patch.d/findbugs.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/04039ab1/dev-support/test-patch.d/findbugs.sh ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.d/findbugs.sh b/dev-support/test-patch.d/findbugs.sh index 4fa5428..16ef8d7 100755 --- a/dev-support/test-patch.d/findbugs.sh +++ b/dev-support/test-patch.d/findbugs.sh @@ -252,7 +252,9 @@ function findbugs_postinstall local branchxml local patchxml local newbugsbase + local fixedbugsbase local new_findbugs_warnings + local fixed_findbugs_warnings local line local firstpart local secondpart @@ -297,6 +299,7 @@ function findbugs_postinstall fi newbugsbase="${PATCH_DIR}/new-findbugs-${fn}" + fixedbugsbase="${PATCH_DIR}/fixed-findbugs-${fn}" "${FINDBUGS_HOME}/bin/computeBugHistory" -useAnalysisTimes -withMessages \ -output "${combined_xml}" \ @@ -326,8 +329,8 @@ function findbugs_postinstall fi #shellcheck disable=SC2016 - new_findbugs_fixed_warnings=$("${FINDBUGS_HOME}/bin/filterBugs" -fixed patch \ - "${combined_xml}" "${newbugsbase}.xml" | ${AWK} '{print $1}') + fixed_findbugs_warnings=$("${FINDBUGS_HOME}/bin/filterBugs" -fixed patch \ + "${combined_xml}" "${fixedbugsbase}.xml" | ${AWK} '{print $1}') if [[ $? != 0 ]]; then popd >/dev/null module_status ${i} -1 "" "${module} cannot run filterBugs (#2) from findbugs" @@ -338,9 +341,7 @@ function findbugs_postinstall continue fi - echo "Found ${new_findbugs_warnings} new Findbugs warnings and ${new_findbugs_fixed_warnings} newly fixed warnings." - findbugs_warnings=$((findbugs_warnings+new_findbugs_warnings)) - findbugs_fixed_warnings=$((findbugs_fixed_warnings+new_findbugs_fixed_warnings)) + echo "Found ${new_findbugs_warnings} new Findbugs warnings and ${fixed_findbugs_warnings} newly fixed warnings." "${FINDBUGS_HOME}/bin/convertXmlToText" -html "${newbugsbase}.xml" \ "${newbugsbase}.html"
