Merge branch 'develop' into stable

google · Apr 7, 2016 · b4410f2 · b4410f2
2 parents 739c686 + db14259
commit b4410f2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
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) {