summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2018-10-04 23:09:58 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-10-04 23:09:58 +0000
commit284f25140409c07911e5be0600f5375204f3f632 (patch)
tree527e3981715abe6694dae1e99ffbc636f7aa8407
parentaf4c7f4037258e1db8f5421ac1becb20d3876a41 (diff)
parente88dac0b90ec2ccd17e7ae8cf62cca3eb4d2b166 (diff)
downloadcore-android-vts-9.0_r6.tar.gz
-rw-r--r--liblog/tests/liblog_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/liblog/tests/liblog_test.cpp b/liblog/tests/liblog_test.cpp
index a8a9a120a..a20808e92 100644
--- a/liblog/tests/liblog_test.cpp
+++ b/liblog/tests/liblog_test.cpp
@@ -130,7 +130,7 @@ static bool isPmsgActive() {
static bool isLogdwActive() {
std::string logdwSignature =
- popenToString("grep /dev/socket/logdw /proc/net/unix");
+ popenToString("grep -a /dev/socket/logdw /proc/net/unix");
size_t beginning = logdwSignature.find(' ');
if (beginning == std::string::npos) return true;
beginning = logdwSignature.find(' ', beginning + 1);
@@ -144,7 +144,7 @@ static bool isLogdwActive() {
end = logdwSignature.find(' ', end + 1);
if (end == std::string::npos) return true;
std::string allLogdwEndpoints = popenToString(
- "grep ' 00000002" + logdwSignature.substr(beginning, end - beginning) +
+ "grep -a ' 00000002" + logdwSignature.substr(beginning, end - beginning) +
" ' /proc/net/unix | " +
"sed -n 's/.* \\([0-9][0-9]*\\)$/ -> socket:[\\1]/p'");
if (allLogdwEndpoints.length() == 0) return true;