commit 1c26e2ab746d485ab484f7efe0870bf901cf722f
author Mark Salyzyn <salyzyn@google.com> Mon Dec 07 23:41:17 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 07 23:41:17 2015 +0000
tree a3d6b33af878f3691faf51984f96e0ead9c3523c
parent e7d49a2f52b19e2795e4dc7964bf472a8eb1ab18
parent bca4f23a59e729f68f3c46f2a8dc47989ca246f6

Merge "logd: test: leniency towards background cgroup" am: 3ea02e8eca
am: 660d17b25c

* commit '660d17b25c6ff2809507a7a2ef435d4ab4c5bf5a':
  logd: test: leniency towards background cgroup

logd/tests/logd_test.cpp

diff --git a/logd/tests/logd_test.cpp b/logd/tests/logd_test.cpp
index 9ac80cf..bd59acb 100644
--- a/logd/tests/logd_test.cpp
+++ b/logd/tests/logd_test.cpp
@@ -439,7 +439,7 @@
 
     EXPECT_GE(250000UL, ns[log_overhead]); // 126886 user
 
-    EXPECT_GE(10000UL, ns[log_latency]); // 5669 user space
+    EXPECT_GE(10000000UL, ns[log_latency]); // 1453559 user space (background cgroup)
 
     EXPECT_GE(20000000UL, ns[log_delay]); // 10500289 user