commit 5add4087c2a83c1e6eed164845339bfb4d73edfb
author Andreas Gampe <agampe@google.com> Wed Sep 07 20:18:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 07 20:18:40 2016 +0000
tree f8b4c32f3658812e7dfca3da1cbbd691fe3e05d5
parent 9de675da28d03798418910ae20026345ceb4c1a2
parent e79e419212d09778738ac9f7bb7331add85da729

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

Change-Id: I2aa7061ca04ce8ce52ac178450e4fbdb73f5df9b

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);
 }