Skip to content
Permalink
Browse files
Fix JENKINS-9178
  • Loading branch information
gboissinot committed Sep 20, 2011
1 parent 1c96eca commit 109634c9e4bca4aff2dd9f3970ece005e42bbb0c
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckPublisher.java
@@ -56,7 +56,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
CppcheckParserResult parser = new CppcheckParserResult(listener, cppcheckConfig.getCppcheckReportPattern(), cppcheckConfig.isIgnoreBlankFiles());
CppcheckReport cppcheckReport;
try {
cppcheckReport = build.getWorkspace().act(parser);
cppcheckReport = build.getModuleRoot().act(parser);
} catch (Exception e) {
CppcheckLogger.log(listener, "Error on cppcheck analysis: " + e);
build.setResult(Result.FAILURE);
@@ -68,7 +68,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
return false;
}

CppcheckSourceContainer cppcheckSourceContainer = new CppcheckSourceContainer(listener, build.getWorkspace(), cppcheckReport.getAllErrors());
CppcheckSourceContainer cppcheckSourceContainer = new CppcheckSourceContainer(listener, build.getModuleRoot(), cppcheckReport.getAllErrors());

CppcheckResult result = new CppcheckResult(cppcheckReport, cppcheckSourceContainer, build);

@@ -89,7 +89,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
copyFilesFromSlaveToMaster(build.getRootDir(), launcher.getChannel(), cppcheckSourceContainer.getInternalMap().values());
}

CppcheckLogger.log(listener, "End of the cppcheck analysis.");
CppcheckLogger.log(listener, "Ending the cppcheck analysis.");
}
return true;
}

0 comments on commit 109634c

Please sign in to comment.