commit a1f43ebf89130e09a36bcd07e0eef87d40be7d55
author Mark Salyzyn <salyzyn@google.com> Wed Mar 15 19:04:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 15 19:04:19 2017 +0000
tree bac8c0ea8479205b012298188571ba7d33a3725f
parent 3547ba5e3f3691cf6f14ed3a704d62d85f783fb8
parent e7b335b4712bc650c93b5b5777a6f8b1d85ad83f

Merge "logcat: test: tail_# occasional failures"
am: e7b335b471

Change-Id: I4176e5e0ef3f0e2b8bc0edc9c49410f516f371f6

logcat/tests/logcat_test.cpp

diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp
index dad74ee..0895834 100644
--- a/logcat/tests/logcat_test.cpp
+++ b/logcat/tests/logcat_test.cpp
@@ -208,9 +208,9 @@
         if ((*ep != '-') && (*ep != '.')) {
             continue;
         }
-        // Find PID field
+        // Find PID field.  Look for ': ' or ':[0-9][0-9][0-9]'
         while (((ep = strchr(ep, ':'))) && (*++ep != ' ')) {
-            ;
+            if (isdigit(ep[0]) && isdigit(ep[1]) && isdigit(ep[2])) break;
         }
         if (!ep) {
             continue;