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

Commit 23caedd7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "logd: disable flaky tests" am: fcaed0ef 

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

Change-Id: I3e142614096eaaad2ea3fde54c403a5dcda9c5f5
parents fbcc431f fcaed0ef

logd/logd_test.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -162,6 +162,7 @@ static char* find_benchmark_spam(char* cp) { 
}

}

#endif

#endif





#ifdef LOGD_ENABLE_FLAKY_TESTS

TEST(logd, statistics) {

TEST(logd, statistics) {

#ifdef __ANDROID__

#ifdef __ANDROID__

    size_t len;

    size_t len;
@@ -237,6 +238,7 @@ TEST(logd, statistics) { 
    GTEST_LOG_(INFO) << "This test does nothing.\n";

    GTEST_LOG_(INFO) << "This test does nothing.\n";

#endif

#endif

}

}

#endif





#ifdef __ANDROID__

#ifdef __ANDROID__

static void caught_signal(int /* signum */) {

static void caught_signal(int /* signum */) {
@@ -720,6 +722,7 @@ TEST(logd, timeout) { 
}

}

#endif

#endif





#ifdef LOGD_ENABLE_FLAKY_TESTS

// b/27242723 confirmed fixed

// b/27242723 confirmed fixed

TEST(logd, SNDTIMEO) {

TEST(logd, SNDTIMEO) {

#ifdef __ANDROID__

#ifdef __ANDROID__
@@ -777,6 +780,7 @@ TEST(logd, SNDTIMEO) { 
    GTEST_LOG_(INFO) << "This test does nothing.\n";

    GTEST_LOG_(INFO) << "This test does nothing.\n";

#endif

#endif

}

}

#endif





TEST(logd, getEventTag_list) {

TEST(logd, getEventTag_list) {

#ifdef __ANDROID__

#ifdef __ANDROID__