commit 16f801ed139543fc11e78309cb0d7bced5af5898
author Andreas Gampe <agampe@google.com> Wed Sep 07 20:21:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 07 20:21:10 2016 +0000
tree faa7a070c02bff5e2acc9f443c2740579150fb47
parent 5a6188d86c2300b65d57f90208e5ef380d9c03c9
parent 937f78b592f008fd7f57d69281c6844148bb677f

Merge "Base: Fix logging_test" am: 3b80e5bc9f am: e79e419212
am: 5add4087c2

Change-Id: I6c7c88fbe021c21760a3dd273a99eebc9e49aa6d

base/logging_test.cpp

diff --git a/base/logging_test.cpp b/base/logging_test.cpp
index 3de42b7..8ecd8fd 100644
--- a/base/logging_test.cpp
+++ b/base/logging_test.cpp
@@ -126,7 +126,12 @@
   char log_char = log_characters[severity];
   std::string holder(__FILE__);
   return android::base::StringPrintf(
-      "%c[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+ %s:[[:digit:]]+] %s",
+      "%c[[:space:]]+"
+      "[[:digit:]]+-[[:digit:]]+[[:space:]]+"
+      "[[:digit:]]+:[[:digit:]]+:[[:digit:]]+[[:space:]]+"
+      "[[:digit:]]+[[:space:]]+"
+      "[[:digit:]]+[[:space:]]+"
+      "%s:[[:digit:]]+] %s",
       log_char, basename(&holder[0]), message);
 }