From de6a71e0e464b5f8fa12afebf69a964878a6bd78 Mon Sep 17 00:00:00 2001 From: Alastair D'Silva Date: Thu, 10 Mar 2016 10:54:38 +1100 Subject: [PATCH 1/2] Improve logging --- .../cppcheck/CppcheckParserResult.java | 4 ++-- .../cppcheck/CppcheckParserResult.java | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckParserResult.java b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckParserResult.java index 68805fd..095904f 100644 --- a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckParserResult.java +++ b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckParserResult.java @@ -80,8 +80,8 @@ public CppcheckReport invoke(java.io.File basedir, VirtualChannel channel) throw CppcheckLogger.log(listener, "Processing " + cppcheckReportFiles.length + " files with the pattern '" + cppcheckReportPattern + "'."); - for (String cppchecReportkFileName : cppcheckReportFiles) { - CppcheckReport cppcheckReport = new CppcheckParser().parse(new File(basedir, cppchecReportkFileName)); + for (String cppcheckReportFileName : cppcheckReportFiles) { + CppcheckReport cppcheckReport = new CppcheckParser().parse(new File(basedir.getAbsoluteFile(), cppcheckReportFileName)); mergeReport(cppcheckReportResult, cppcheckReport); } } catch (Exception e) { diff --git a/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckParserResult.java b/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckParserResult.java index b16c8b6..eb2a617 100644 --- a/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckParserResult.java +++ b/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckParserResult.java @@ -62,12 +62,27 @@ public CppcheckReport invoke(java.io.File basedir, VirtualChannel channel) throw CppcheckLogger.log(listener, "Processing " + cppcheckReportFiles.length + " files with the pattern '" + cppcheckReportPattern + "'."); - for (String cppchecReportkFileName : cppcheckReportFiles) { - CppcheckReport cppcheckReport = new CppcheckParser().parse(new File(basedir, cppchecReportkFileName), listener); + for (String cppcheckReportFileName : cppcheckReportFiles) { + CppcheckReport cppcheckReport = new CppcheckParser().parse(new File(basedir, cppcheckReportFileName), listener); mergeReport(cppcheckReportResult, cppcheckReport); + + CppcheckLogger.log(listener, "Merged " + cppcheckReportResult.getErrorSeverityList().size() + " Error severities"); + CppcheckLogger.log(listener, "Merged " + cppcheckReportResult.getWarningSeverityList().size() + " Warning severities"); + CppcheckLogger.log(listener, "Merged " + cppcheckReportResult.getStyleSeverityList().size() + " Style severities"); + CppcheckLogger.log(listener, "Merged " + cppcheckReportResult.getPerformanceSeverityList().size() + " Performance severities"); + CppcheckLogger.log(listener, "Merged " + cppcheckReportResult.getInformationSeverityList().size() + " Information severities"); + CppcheckLogger.log(listener, "Merged " + cppcheckReportResult.getNoCategorySeverityList().size() + " No Category severities"); + CppcheckLogger.log(listener, "Merged " + cppcheckReportResult.getPortabilitySeverityList().size() + " Portability severities"); + CppcheckLogger.log(listener, "Merged " + cppcheckReportResult.getAllErrors().size() + " All Errors"); + CppcheckLogger.log(listener, "Merged " + cppcheckReportResult.getVersions().size() + " Versions"); } } catch (Exception e) { CppcheckLogger.log(listener, "Parsing throws exceptions. " + e.getMessage()); + StackTraceElement[] elements = e.getStackTrace(); + + for (StackTraceElement element : elements) { + CppcheckLogger.log(listener, element.toString()); + } return null; } From bad3a3b0546d0a8ccb6105e599f77e63f323da75 Mon Sep 17 00:00:00 2001 From: Alastair D'Silva Date: Thu, 10 Mar 2016 11:13:01 +1100 Subject: [PATCH 2/2] Remove unnecessary change --- .../hudson/plugins/cppcheck/CppcheckParserResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckParserResult.java b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckParserResult.java index 095904f..c7f014d 100644 --- a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckParserResult.java +++ b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckParserResult.java @@ -81,7 +81,7 @@ public CppcheckReport invoke(java.io.File basedir, VirtualChannel channel) throw CppcheckLogger.log(listener, "Processing " + cppcheckReportFiles.length + " files with the pattern '" + cppcheckReportPattern + "'."); for (String cppcheckReportFileName : cppcheckReportFiles) { - CppcheckReport cppcheckReport = new CppcheckParser().parse(new File(basedir.getAbsoluteFile(), cppcheckReportFileName)); + CppcheckReport cppcheckReport = new CppcheckParser().parse(new File(basedir, cppcheckReportFileName)); mergeReport(cppcheckReportResult, cppcheckReport); } } catch (Exception e) {