Merge branch 'release-candidate' into stable

CHANGELOG.md

@@ -1,6 +1,10 @@
+# 3.0.7
+
+* Resolved bug in which a failed unit test on Xcode 8 betas would cause arc unit to hang.
+
 # 3.0.6
 
-* Workaround for bug in Xcode 8 betas 1 and 2 that cause `arc unit`.
+* Workaround for bug in Xcode 8 betas 1 and 2 that cause `arc unit` to hang.
 
 # 3.0.5
 

engine/XcodeUnitTestEngine.php

@@ -114,7 +114,7 @@ private function xcodeMajorVersion() {
     return null;
   }
 
-  public function execFutureEndOnLine($future, $line) {
+  public function execFutureEndOnLine($future, $stdoutline, $stderrline) {
     $wait  = $future->getDefaultWait();
     $hasSeenLine = false;
     do {
@@ -130,7 +130,8 @@ public function execFutureEndOnLine($future, $line) {
       }
 
       $pipes = $future->read();
-      if (!$hasSeenLine && strpos($pipes[0], $line) !== false) {
+      if (!$hasSeenLine && (strpos($pipes[0], $stdoutline) !== false
+                            || strpos($pipes[1], $stderrline) !== false)) {
         $hasSeenLine = true;
 
       } else if ($hasSeenLine && empty($pipes[0])) {
@@ -175,7 +176,10 @@ public function run() {
           $this->xcodebuildBinary, implode(' ', $xcodeargs));
 
         list($builderror, $xcbuild_stdout, $xcbuild_stderr) =
-          $this->execFutureEndOnLine($future, "** TEST EXECUTE SUCCEEDED **");
+          $this->execFutureEndOnLine($future,
+            "** TEST EXECUTE SUCCEEDED **",
+            "** TEST EXECUTE FAILED **"
+          );
       }
 
     } else {