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

Commit 31688a48 authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "logd: disable flaky logd.timeout test" am: 6923de12 am: 3a962c6c 

Change-Id: Ia11679aa8fa1eaad290282de830265b972bdf807
parents a454c013 3a962c6c

logd/tests/logd_test.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -583,6 +583,7 @@ TEST(logd, timeout_start_epoch) { 
        "dumpAndClose lids=0,1,2,3,4,5 timeout=6 start=0.000000000");

        "dumpAndClose lids=0,1,2,3,4,5 timeout=6 start=0.000000000");

}

}





#ifdef ENABLE_FLAKY_TESTS

// b/26447386 refined behavior

// b/26447386 refined behavior

TEST(logd, timeout) {

TEST(logd, timeout) {

#ifdef __ANDROID__

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

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

#endif

#endif

}

}

#endif





// b/27242723 confirmed fixed

// b/27242723 confirmed fixed

TEST(logd, SNDTIMEO) {

TEST(logd, SNDTIMEO) {