yetus-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sek...@apache.org
Subject yetus git commit: YETUS-489. checkstyle.sh does not support checkstyle 6.14 or upper.
Date Wed, 01 Mar 2017 02:24:32 GMT
Repository: yetus
Updated Branches:
  refs/heads/master 9cbfe9c04 -> c08a3ee6c


YETUS-489. checkstyle.sh does not support checkstyle 6.14 or upper.

Signed-off-by: Kengo Seki <sekikn@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/c08a3ee6
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/c08a3ee6
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/c08a3ee6

Branch: refs/heads/master
Commit: c08a3ee6ce31360cb4022a6cb880482042f2dbba
Parents: 9cbfe9c
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Wed Mar 1 02:32:54 2017 +0900
Committer: Kengo Seki <sekikn@apache.org>
Committed: Tue Feb 28 21:22:32 2017 -0500

----------------------------------------------------------------------
 precommit/test-patch.d/checkstyle.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/yetus/blob/c08a3ee6/precommit/test-patch.d/checkstyle.sh
----------------------------------------------------------------------
diff --git a/precommit/test-patch.d/checkstyle.sh b/precommit/test-patch.d/checkstyle.sh
index 417db45..62ec887 100755
--- a/precommit/test-patch.d/checkstyle.sh
+++ b/precommit/test-patch.d/checkstyle.sh
@@ -184,11 +184,14 @@ function checkstyle_runner
 
     # we're going to execute it and pull out
     # anything that beings with a /.  that's
-    # almost certainly checkstyle output
+    # almost certainly checkstyle output.
+    # checkstyle 6.14 or upper adds severity
+    # to the beginning of line, so removing it
 
     #shellcheck disable=SC2086
     echo_and_redirect "${logfile}" ${cmd}
-    ${GREP} ^/ "${logfile}" \
+    ${SED} -e "s,^\[ERROR\] ,,g" -e "s,^\[WARN\] ,,g" "${logfile}" \
+      | ${GREP} ^/ \
       | ${SED} -e "s,${BASEDIR},.,g" \
       > "${tmp}"
 


Mime
View raw message