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

Commit 2d506164 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "init: don't generate tombstones for expected test failures" am: 0b8d2fef am: 2a90da3e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96debd5144ce163cdab07a7018208858e17658f4
parents 3f473c9d 2a90da3e

init/firmware_handler_test.cpp

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ TEST(firmware_handler, HandleAbort) { 
}



int HandleAbort(int argc, char** argv) {

    // Since this is an expected failure, disable debuggerd to not generate a tombstone.

    signal(SIGABRT, SIG_DFL);

    abort();

    return 0;

}

init/subcontext_test.cpp

+2 −0
Original line number Diff line number Diff line
@@ -202,6 +202,8 @@ BuiltinFunctionMap BuildTestFunctionMap() { 


    // For RecoverAfterAbort

    auto do_cause_log_fatal = [](const BuiltinArguments& args) -> Result<void> {

        // Since this is an expected failure, disable debuggerd to not generate a tombstone.

        signal(SIGABRT, SIG_DFL);

        return Error() << std::string(4097, 'f');

    };

    auto do_generate_sane_error = [](const BuiltinArguments& args) -> Result<void> {