Skip to content
This repository has been archived by the owner on Sep 7, 2022. It is now read-only.

Commit

Permalink
Merge branch 'develop' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Verkoeyen committed Apr 27, 2016
2 parents b4410f2 + 0a412f1 commit cc0f633
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 3.0.0

* Commands now always run from the root directory of the project rather than from the shell's
current working directory. This may be a breaking change.

## 2.1.1

* Improved overall test parsing time by approximately 50%.
Expand Down
3 changes: 3 additions & 0 deletions engine/XcodeUnitTestEngine.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ public function run() {

if (!empty($this->preBuildCommand)) {
$future = new ExecFuture($this->preBuildCommand);
$future->setCWD(Filesystem::resolvePath($this->getWorkingCopy()->getProjectRoot()));
$future->resolvex();
}

Expand All @@ -141,6 +142,7 @@ public function run() {
// Get the OBJROOT
$future = new ExecFuture('%C %C -showBuildSettings test',
$this->xcodebuildBinary, implode(' ', $xcodeargs));
$future->setCWD(Filesystem::resolvePath($this->getWorkingCopy()->getProjectRoot()));
list(, $settings_stdout, ) = $future->resolve();
if (!preg_match('/OBJROOT = (.+)/', $settings_stdout, $matches)) {
throw new Exception('Unable to find OBJROOT configuration.');
Expand All @@ -154,6 +156,7 @@ public function run() {

$future = new ExecFuture('%C show -use-color=false -instr-profile "%C" "%C"',
$this->covBinary, $profdata, $product);
$future->setCWD(Filesystem::resolvePath($this->getWorkingCopy()->getProjectRoot()));

try {
list($coverage, $coverage_error) = $future->resolvex();
Expand Down

0 comments on commit cc0f633

Please sign in to comment.