Android: uses a fifo rather than logcat for the test runner.

build/android/pylib/test_package.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 import logging
 import re
 import os
 import pexpect
 
@@ skipping 21 matching lines @@
   """
 
   def __init__(self, adb, device, test_suite, timeout, rebaseline,
                performance_test, cleanup_test_files, tool, dump_debug_info):
     self.adb = adb
     self.device = device
     self.test_suite_full = test_suite
     self.test_suite = os.path.splitext(test_suite)[0]
     self.test_suite_basename = self._GetTestSuiteBaseName()
     self.test_suite_dirname = os.path.dirname(
-        self.test_suite.split(self.test_suite_basename)[0]);
+        self.test_suite.split(self.test_suite_basename)[0])
     self.rebaseline = rebaseline
     self.performance_test = performance_test
     self.cleanup_test_files = cleanup_test_files
     self.tool = tool
     if timeout == 0:
       timeout = 60
     # On a VM (e.g. chromium buildbots), this timeout is way too small.
     if os.environ.get('BUILDBOT_SLAVENAME'):
       timeout = timeout * 2
     self.timeout = timeout * self.tool.GetTimeoutScale()
@@ skipping 84 matching lines @@
     """Watches the test output.
     Args:
       p: the process generating output as created by pexpect.spawn.
     """
     ok_tests = []
     failed_tests = []
     crashed_tests = []
     timed_out = False
     overall_fail = False
     re_run = re.compile('\[ RUN      \] ?(.*)\r\n')
-    # APK tests rely on the END tag.
-    re_end = re.compile('\[ END      \] ?(.*)\r\n')
+    # APK tests rely on the PASSED tag.
+    re_passed = re.compile('\[  PASSED  \] ?(.*)\r\n')
     # Signal handlers are installed before starting tests
     # to output the CRASHED marker when a crash happens.
     re_crash = re.compile('\[ CRASHED      \](.*)\r\n')
     re_fail = re.compile('\[  FAILED  \] ?(.*)\r\n')
     re_runner_fail = re.compile('\[ RUNNER_FAILED \] ?(.*)\r\n')
-    re_ok = re.compile('\[       OK \] ?(.*)\r\n')
+    re_ok = re.compile('\[       OK \] ?(.*?) .*\r\n')
     io_stats_before = self._BeginGetIOStats()
     try:
       while True:
-        found = p.expect([re_run, re_end, re_runner_fail], timeout=self.timeout)
-        if found == 1:  # matched END.
+        found = p.expect([re_run, re_passed, re_runner_fail],
+                         timeout=self.timeout)
+        if found == 1:  # matched PASSED.
           break
         if found == 2:  # RUNNER_FAILED
           logging.error('RUNNER_FAILED')
           overall_fail = True
           break
         if self.dump_debug_info:
           self.dump_debug_info.TakeScreenshot('_Test_Start_Run_')
         full_test_name = p.match.group(1).replace('\r', '')
         found = p.expect([re_ok, re_fail, re_crash], timeout=self.timeout)
         if found == 0:  # re_ok
-          ok_tests += [BaseTestResult(full_test_name, p.before)]
-          continue
+          if full_test_name == p.match.group(1).replace('\r', ''):
+            ok_tests += [BaseTestResult(full_test_name, p.before)]
+            continue
         if found == 2: # re_crash
           crashed_tests += [BaseTestResult(full_test_name, p.before)]
           overall_fail = True
           break
         # The test failed.
         failed_tests += [BaseTestResult(full_test_name, p.before)]
     except pexpect.EOF:
       logging.error('Test terminated - EOF')
     except pexpect.TIMEOUT:
       logging.error('Test terminated after %d second timeout.',
                     self.timeout)
       timed_out = True
     finally:
       p.close()
     if not self.rebaseline:
       ok_tests += self._EndGetIOStats(io_stats_before)
       ret_code = self._GetGTestReturnCode()
       if ret_code:
         failed_tests += [BaseTestResult('gtest exit code: %d' % ret_code,
                                         'pexpect.before: %s'
                                         '\npexpect.after: %s'
                                         % (p.before,
                                            p.after))]
     # Create TestResults and return
     return TestResults.FromRun(ok=ok_tests, failed=failed_tests,
                                crashed=crashed_tests, timed_out=timed_out,
                                overall_fail=overall_fail)