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

Commit cc0f633

Browse files
author
Jeff Verkoeyen
committed
Merge branch 'develop' into stable
2 parents b4410f2 + 0a412f1 commit cc0f633

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 3.0.0
2+
3+
* Commands now always run from the root directory of the project rather than from the shell's
4+
current working directory. This may be a breaking change.
5+
16
## 2.1.1
27

38
* Improved overall test parsing time by approximately 50%.

engine/XcodeUnitTestEngine.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ public function run() {
119119

120120
if (!empty($this->preBuildCommand)) {
121121
$future = new ExecFuture($this->preBuildCommand);
122+
$future->setCWD(Filesystem::resolvePath($this->getWorkingCopy()->getProjectRoot()));
122123
$future->resolvex();
123124
}
124125

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

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

158161
try {
159162
list($coverage, $coverage_error) = $future->resolvex();

0 commit comments

Comments
 (0)