Merge branch 'develop' into stable

Jeff Verkoeyen · Jeff Verkoeyen · commit b4410f255f43 · 2016-04-07T19:06:52.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.1
+
+* Improved overall test parsing time by approximately 50%.
+
 ## 2.1.0
 
 * Added a `pre-build` configuration option.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # xcode-test-engine for arc
 
-xcode-test-engine is a test engine for use with [Phabricator](phabricator.org)'s `arc` command line tool.
+xcode-test-engine is a test engine for use with [Phabricator](http://phabricator.org)'s `arc`
+command line tool.
 
 ## Features
 
diff --git a/parser/XcodeTestResultParser.php b/parser/XcodeTestResultParser.php
@@ -63,7 +63,7 @@ public function parseTestResults($path, $test_results) {
         continue;
       }
 
-      if (preg_match('/.+?error:/', $line) === 1) {
+      if (strpos($line, 'error:') !== false) {
         $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 (preg_match('/.+?error:/', $line) === 1) {`
	`66`	`+ if (strpos($line, 'error:') !== false) {`
`67`	`67`	`$result = new ArcanistUnitTestResult();`
`68`	`68`	`$result->setName('xcode-unit-engine');`
`69`	`69`	`foreach ($this->xcodeargs as $arg) {`