diff options
author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /liblog/tests/liblog_test.cpp | |
parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'liblog/tests/liblog_test.cpp')
-rw-r--r-- | liblog/tests/liblog_test.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/liblog/tests/liblog_test.cpp b/liblog/tests/liblog_test.cpp index fbc3d7a5a..c49d87b59 100644 --- a/liblog/tests/liblog_test.cpp +++ b/liblog/tests/liblog_test.cpp @@ -2768,20 +2768,3 @@ TEST(liblog, __android_log_pmsg_file_read) { #endif } #endif // ENABLE_FLAKY_TESTS - -TEST(liblog, android_lookupEventTagNum) { -#ifdef __ANDROID__ - EventTagMap* map = android_openEventTagMap(NULL); - EXPECT_TRUE(NULL != map); - std::string Name = android::base::StringPrintf("a%d", getpid()); - int tag = android_lookupEventTagNum(map, Name.c_str(), "(new|1)", - ANDROID_LOG_UNKNOWN); - android_closeEventTagMap(map); - if (tag == -1) system("tail -3 /dev/event-log-tags >&2"); - EXPECT_NE(-1, tag); - EXPECT_NE(0, tag); - EXPECT_GT(UINT32_MAX, (unsigned)tag); -#else - GTEST_LOG_(INFO) << "This test does nothing.\n"; -#endif -} |