Merge branch 'develop' into stable

Jeff Verkoeyen · Jeff Verkoeyen · commit 7f2f50991dad · 2016-04-01T15:09:30.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.0.2
+
+* Error line detection is now more flexible. Any output line with "error:" will be detected and
+  bubble up as an error.
+
 ## 2.0.1
 
 * Better handling of non-unit-test failures, such as CocoaPods getting out of sync.
diff --git a/parser/XcodeTestResultParser.php b/parser/XcodeTestResultParser.php
@@ -63,7 +63,7 @@ public function parseTestResults($path, $test_results) {
         continue;
       }
 
-      if ($this->startsWith($line, 'error: ')) {
+      if (preg_match('/.+?error:/', $line) === 1) {
         $result = new ArcanistUnitTestResult();
         $result->setName('xcode-unit-engine');
         foreach ($this->xcodeargs as $arg) {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function parseTestResults($path, $test_results) {`
`63`	`63`	`continue;`
`64`	`64`	`}`
`65`	`65`
`66`		`- if ($this->startsWith($line, 'error: ')) {`
	`66`	`+ if (preg_match('/.+?error:/', $line) === 1) {`
`67`	`67`	`$result = new ArcanistUnitTestResult();`
`68`	`68`	`$result->setName('xcode-unit-engine');`
`69`	`69`	`foreach ($this->xcodeargs as $arg) {`