Merge branch 'develop' into stable

Author: Jeff Verkoeyen

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.1.0
+
+* Added a `pre-build` configuration option.
+
 ## 2.0.2
 
 * Error line detection is now more flexible. Any output line with "error:" will be detected and

README.md

@@ -97,30 +97,40 @@ Now modify your `.arcconfig` file by adding the following configuration:
 
 ### Configuration options
 
+#### Build configuration options
+
+Any value provided to "build" will be passed along to xcodebuild as a flag.
+
     "unit.xcode": {
       "build": { ... }
     }
 
-Any value provided to "build" will be passed along to xcodebuild as a flag.
+#### Picking the coverage product
+
+Provide the path to the product for which coverage should be calculated. If building a
+library/framework this might be the framework binary product.
 
     "unit.xcode": {
       "coverage": {
         "product": " ... "
       }
     }
 
-Provide the path to the product for which coverage should be
-calculated. If building a library/framework this might be the
-framework binary product.
+#### Pre-build commands
 
-### Viewing coverage results in Phabricator
+Some projects require a pre-build script that runs before the xcodebuild command.
 
-To view coverage results in Phabricator diff UI you must run
+    "unit.xcode": {
+      "pre-build": "execute this command before the build step"
+    }
+
+For example, CocoaPods projects may need to be re-generated.
 
-    arc diff --coverage
+      "pre-build": "pod install --project-directory=path/ --no-repo-update"
+
+### Viewing coverage results in Phabricator
 
-Coverage will appear for affected source files in Side-by-Side
-mode as a colored bar.
+Coverage will appear for affected source files in Side-by-Side mode as a colored bar.
 
 ## License
 

engine/XcodeUnitTestEngine.php

@@ -29,6 +29,7 @@ final class XcodeUnitTestEngine extends ArcanistUnitTestEngine {
   private $affectedTests;
   private $xcodebuild;
   private $coverage;
+  private $preBuildCommand;
 
   public function getEngineConfigurationName() {
     return 'xcode-test-engine';
@@ -95,6 +96,10 @@ protected function loadEnvironment() {
     } else {
       $this->xcodebuild["enableCodeCoverage"] = "NO";
     }
+
+    if (array_key_exists('pre-build', $config['unit.xcode'])) {
+      $this->preBuildCommand = $config['unit.xcode']['pre-build'];
+    }
   }
 
   public function run() {
@@ -112,6 +117,11 @@ public function run() {
       $xcodeargs []= "-$key \"$value\"";
     }
 
+    if (!empty($this->preBuildCommand)) {
+      $future = new ExecFuture($this->preBuildCommand);
+      $future->resolvex();
+    }
+
     // Build and run unit tests
     $future = new ExecFuture('%C %C test',
       $this->xcodebuildBinary, implode(' ', $xcodeargs));
@@ -135,7 +145,7 @@ public function run() {
       if (!preg_match('/OBJROOT = (.+)/', $settings_stdout, $matches)) {
         throw new Exception('Unable to find OBJROOT configuration.');
       }
-      
+
       $objroot = $matches[1];
       $covroot = $objroot."/CodeCoverage/".$this->xcodebuild['scheme'];
       $profdata = $covroot."/Coverage.profdata";