Fix [JENKINS-11096] - Always process from workspace

jenkinsci · Dec 31, 2011 · 473c633 · 473c633
1 parent ced2be1
commit 473c633
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckPublisher.java b/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckPublisher.java
@@ -56,11 +56,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
             CppcheckParserResult parser = new CppcheckParserResult(listener, cppcheckConfig.getPattern(), cppcheckConfig.isIgnoreBlankFiles());
             CppcheckReport cppcheckReport;
             try {
-                if (cppcheckConfig.isUseWorkspaceAsRootPath()) {
-                    cppcheckReport = build.getWorkspace().act(parser);
-                } else {
-                    cppcheckReport = build.getModuleRoot().act(parser);
-                }
+                cppcheckReport = build.getWorkspace().act(parser);
             } catch (Exception e) {
                 CppcheckLogger.log(listener, "Error on cppcheck analysis: " + e);
                 build.setResult(Result.FAILURE);

diff --git a/src/main/java/org/jenkinsci/plugins/cppcheck/config/CppcheckConfig.java b/src/main/java/org/jenkinsci/plugins/cppcheck/config/CppcheckConfig.java
@@ -10,16 +10,9 @@
  */
 public class CppcheckConfig implements Serializable {
 
-    private transient String cppcheckReportPattern;
-
     private String pattern;
-
-    private boolean useWorkspaceAsRootPath;
-
     private boolean ignoreBlankFiles;
-
     private CppcheckConfigSeverityEvaluation configSeverityEvaluation = new CppcheckConfigSeverityEvaluation();
-
     private CppcheckConfigGraph configGraph = new CppcheckConfigGraph();
 
     public CppcheckConfig() {
@@ -28,7 +21,6 @@ public CppcheckConfig() {
     @DataBoundConstructor
     @SuppressWarnings("unused")
     public CppcheckConfig(String pattern,
-                          boolean useWorkspaceAsRootPath,
                           boolean ignoreBlankFiles, String threshold,
                           String newThreshold, String failureThreshold,
                           String newFailureThreshold, String healthy, String unHealthy,
@@ -46,7 +38,6 @@ public CppcheckConfig(String pattern,
                           boolean displayInformationSeverity) {
 
         this.pattern = pattern;
-        this.useWorkspaceAsRootPath = useWorkspaceAsRootPath;
         this.ignoreBlankFiles = ignoreBlankFiles;
         this.configSeverityEvaluation = new CppcheckConfigSeverityEvaluation(
                 threshold, newThreshold, failureThreshold, newFailureThreshold, healthy, unHealthy,
@@ -90,11 +81,18 @@ public CppcheckConfigGraph getConfigGraph() {
         return configGraph;
     }
 
+    /*
+    Backward compatibility
+     */
+    private transient String cppcheckReportPattern;
+    private transient boolean useWorkspaceAsRootPath;
+
     @SuppressWarnings("unused")
     private Object readResolve() {
         if (this.cppcheckReportPattern != null) {
             this.pattern = cppcheckReportPattern;
         }
         return this;
     }
+
 }
diff --git a/src/main/resources/org/jenkinsci/plugins/cppcheck/CppcheckPublisher/config.jelly b/src/main/resources/org/jenkinsci/plugins/cppcheck/CppcheckPublisher/config.jelly
@@ -11,11 +11,6 @@
         <f:textbox name="cppcheck.pattern" value="${config.pattern}"/>
     </f:entry>
 
-    <f:entry>
-        <f:checkbox name="cppcheck.useWorkspaceAsRootPath" checked="${config.useWorkspaceAsRootPath}"/>
-        <label>${%Use the workspace as root path to look for reports}</label>
-    </f:entry>
-
     <f:entry>
         <f:checkbox name="cppcheck.ignoreBlankFiles" checked="${config.ignoreBlankFiles}"/>
         <label>${%Ignore blank files}</label>