commit 3f0e726cd614f73a0af3918f7b9d03378df8f97a
author Andreas Gampe <agampe@google.com> Wed Sep 07 20:23:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 07 20:23:41 2016 +0000
tree 7a696c1eebc602be0f28a74582c88dda43a55d56
parent eb4bb247b5e5a91ac2be998e5c5a813c5043f53f
parent 16f801ed139543fc11e78309cb0d7bced5af5898

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

Change-Id: Ic0a1999ba4b41e89b3367bf8fed5c17b87532924

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