Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10e45c1d authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "liblog: disable property tag tests" am: 86adfc7b 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1385695

Change-Id: Id9736173f3e278c5085dc2d1371a7b3e0b2da662
parents d836a61b 86adfc7b

liblog/tests/liblog_global_state.cpp

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ TEST(liblog_global_state, is_loggable_minimum_log_priority_only) { 
  EXPECT_EQ(1, __android_log_is_loggable(ANDROID_LOG_WARN, LOG_TAG, ANDROID_LOG_INFO));

}



#ifdef LIBLOG_FLAKY_PROPERTY_TEST

TEST(liblog_global_state, is_loggable_tag_log_priority_only) {

#ifdef __ANDROID__

  EXPECT_EQ(0, __android_log_is_loggable(ANDROID_LOG_DEBUG, LOG_TAG, ANDROID_LOG_INFO));
@@ -247,3 +248,4 @@ TEST(liblog_global_state, is_loggable_both_set) { 
  GTEST_SKIP() << "No log tag properties on host";

#endif

}

#endif