summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2016-09-07 11:31:37 -0700
committerAndreas Gampe <agampe@google.com>2016-09-07 11:39:59 -0700
commit7c1cdd770062226f5e6c12b98b66bd81f5067e92 (patch)
tree735de3ed10d3c6cbd0f26bde591f43b7ab076531 /base
parentf74553f85270fcb9263c98c472fc3fdc93c18114 (diff)
downloadsystem_core-7c1cdd770062226f5e6c12b98b66bd81f5067e92.tar.gz
system_core-7c1cdd770062226f5e6c12b98b66bd81f5067e92.tar.bz2
system_core-7c1cdd770062226f5e6c12b98b66bd81f5067e92.zip
Base: Fix logging_test
Update the expected logging pattern. Bug: 31338270 Test: mmma system/core/base && adb sync && adb shell /data/nativetest/libbase_test/libbase_test32 Change-Id: I299620669126bc0258cad6e30d5b40bff5ea92ad
Diffstat (limited to 'base')
-rw-r--r--base/logging_test.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/base/logging_test.cpp b/base/logging_test.cpp
index 3de42b774..8ecd8fd68 100644
--- a/base/logging_test.cpp
+++ b/base/logging_test.cpp
@@ -126,7 +126,12 @@ std::string make_log_pattern(android::base::LogSeverity severity,
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);
}