Merge pull request #384 from madvay/cfReport

CycleFinderTask should indeed write a report on failure
j2objc-contrib · Aug 23, 2015 · 53d3eae · 53d3eae
2 parents 881b8b9 + 5c93f8b
commit 53d3eae
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/groovy/com/github/j2objccontrib/j2objcgradle/tasks/CycleFinderTask.groovy b/src/main/groovy/com/github/j2objccontrib/j2objcgradle/tasks/CycleFinderTask.groovy
@@ -166,7 +166,7 @@ class CycleFinderTask extends DefaultTask {
             if (!Utils.isProjectExecNonZeroExit(exception)) {
                 throw exception
             }
-
+            
             String cyclesFoundStr = Utils.matchRegexOutputs(stdout, stderr, cyclesFoundRegex)
             if (!cyclesFoundStr?.isInteger()) {
                 String message =
@@ -194,10 +194,10 @@ class CycleFinderTask extends DefaultTask {
                 throw new InvalidUserDataException(message)
             }
             // Suppress exception when cycles found == cycleFinderExpectedCycles
+        } finally {
+            // Write output always.
+            getReportFile().write(Utils.stdOutAndErrToLogString(stdout, stderr))
+            logger.debug("CycleFinder Output: ${getReportFile().path}")
         }
-
-        // Only write output if task is successful
-        getReportFile().write(Utils.stdOutAndErrToLogString(stdout, stderr))
-        logger.debug("CycleFinder Output: ${getReportFile().path}")
     }
 }