commit e79e419212d09778738ac9f7bb7331add85da729
author Andreas Gampe <agampe@google.com> Wed Sep 07 20:16:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 07 20:16:10 2016 +0000
tree 70daddbc08d1df93a4ce1dad5fd73c329a8f427c
parent eef52c49d7fc4cc054c5d408cd2d509b537621d7
parent 3b80e5bc9f356cdab14982563b1edb5654fd8e70

Merge "Base: Fix logging_test"
am: 3b80e5bc9f

Change-Id: I7c0d1e62e5d99d2d9d87ffd6d0e6f228ccdb3dd1

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