diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-07-28 09:25:11 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2015-07-28 09:37:07 -0700 |
| commit | cb41e3673b81f246a45ac1ab38ba0c8490ceb0a1 (patch) | |
| tree | 5b31d233f9e58bcc569e068f5dd78555482e3f36 /logd/tests | |
| parent | 15b8a778760707b33bffd97491ccc80854d994ce (diff) | |
| download | core-cb41e3673b81f246a45ac1ab38ba0c8490ceb0a1.tar.gz core-cb41e3673b81f246a45ac1ab38ba0c8490ceb0a1.tar.bz2 core-cb41e3673b81f246a45ac1ab38ba0c8490ceb0a1.zip | |
logd: deprecate TARGET_USES_LOGD
This is not the kernel logger you are looking for
Bug: 22787659
Change-Id: Idbf8fae908287ae9a96007b6353ec56d3c49f5bf
Diffstat (limited to 'logd/tests')
| -rw-r--r-- | logd/tests/Android.mk | 4 | ||||
| -rw-r--r-- | logd/tests/logd_test.cpp | 34 |
2 files changed, 0 insertions, 38 deletions
diff --git a/logd/tests/Android.mk b/logd/tests/Android.mk index 85ca4ac92..a7c6b5326 100644 --- a/logd/tests/Android.mk +++ b/logd/tests/Android.mk @@ -34,10 +34,6 @@ test_c_flags := \ -Werror \ -fno-builtin \ -ifneq ($(TARGET_USES_LOGD),false) -test_c_flags += -DTARGET_USES_LOGD=1 -endif - test_src_files := \ logd_test.cpp diff --git a/logd/tests/logd_test.cpp b/logd/tests/logd_test.cpp index 3266360fd..44fa95c9f 100644 --- a/logd/tests/logd_test.cpp +++ b/logd/tests/logd_test.cpp @@ -137,13 +137,7 @@ TEST(logd, statistics) { alloc_statistics(&buf, &len); -#ifdef TARGET_USES_LOGD ASSERT_TRUE(NULL != buf); -#else - if (!buf) { - return; - } -#endif // remove trailing FF char *cp = buf + len - 1; @@ -167,7 +161,6 @@ TEST(logd, statistics) { EXPECT_EQ(0, truncated); -#ifdef TARGET_USES_LOGD char *main_logs = strstr(cp, "\nChattiest UIDs in main "); EXPECT_TRUE(NULL != main_logs); @@ -179,7 +172,6 @@ TEST(logd, statistics) { char *events_logs = strstr(cp, "\nChattiest UIDs in events "); EXPECT_TRUE(NULL != events_logs); -#endif delete [] buf; } @@ -419,37 +411,17 @@ TEST(logd, benchmark) { return; } -#ifdef TARGET_USES_LOGD EXPECT_GE(200000UL, ns[log_maximum_retry]); // 104734 user -#else - EXPECT_GE(10000UL, ns[log_maximum_retry]); // 5636 kernel -#endif -#ifdef TARGET_USES_LOGD EXPECT_GE(90000UL, ns[log_maximum]); // 46913 user -#else - EXPECT_GE(10000UL, ns[log_maximum]); // 5637 kernel -#endif EXPECT_GE(4096UL, ns[clock_overhead]); // 4095 -#ifdef TARGET_USES_LOGD EXPECT_GE(250000UL, ns[log_overhead]); // 126886 user -#else - EXPECT_GE(100000UL, ns[log_overhead]); // 50945 kernel -#endif -#ifdef TARGET_USES_LOGD EXPECT_GE(10000UL, ns[log_latency]); // 5669 user space -#else - EXPECT_GE(500000UL, ns[log_latency]); // 254200 kernel -#endif -#ifdef TARGET_USES_LOGD EXPECT_GE(20000000UL, ns[log_delay]); // 10500289 user -#else - EXPECT_GE(55000UL, ns[log_delay]); // 27341 kernel -#endif for (unsigned i = 0; i < sizeof(ns) / sizeof(ns[0]); ++i) { EXPECT_NE(0UL, ns[i]); @@ -457,14 +429,8 @@ TEST(logd, benchmark) { alloc_statistics(&buf, &len); -#ifdef TARGET_USES_LOGD bool collected_statistics = !!buf; EXPECT_EQ(true, collected_statistics); -#else - if (!buf) { - return; - } -#endif ASSERT_TRUE(NULL != buf); |