ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "logd: disable flaky tests" am: fcaed0effa

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

Change-Id: I3e142614096eaaad2ea3fde54c403a5dcda9c5f5
This commit is contained in:
Treehugger Robot 2020-07-31 20:47:39 +00:00 • committed by Automerger Merge Worker
commit 23caedd74f
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
logd/logd_test.cpp
View file

@ -162,6 +162,7 @@ static char* find_benchmark_spam(char* cp) {
}
#endif
#ifdef LOGD_ENABLE_FLAKY_TESTS
TEST(logd, statistics) {
#ifdef __ANDROID__
size_t len;
@ -237,6 +238,7 @@ TEST(logd, statistics) {
GTEST_LOG_(INFO) << "This test does nothing.\n";
#endif
}
#endif
#ifdef __ANDROID__
static void caught_signal(int /* signum */) {
@ -720,6 +722,7 @@ TEST(logd, timeout) {
}
#endif
#ifdef LOGD_ENABLE_FLAKY_TESTS
// b/27242723 confirmed fixed
TEST(logd, SNDTIMEO) {
#ifdef __ANDROID__
@ -777,6 +780,7 @@ TEST(logd, SNDTIMEO) {
GTEST_LOG_(INFO) << "This test does nothing.\n";
#endif
}
#endif
TEST(logd, getEventTag_list) {
#ifdef __ANDROID__