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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96debd5144ce163cdab07a7018208858e17658f4
This commit is contained in:
Treehugger Robot 2020-12-15 19:02:55 +00:00 • committed by Automerger Merge Worker
commit 2d50616415
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
init/firmware_handler_test.cpp
View file

@ -79,6 +79,8 @@ TEST(firmware_handler, HandleAbort) {
} }
int HandleAbort(int argc, char** argv) { int HandleAbort(int argc, char** argv) {
// Since this is an expected failure, disable debuggerd to not generate a tombstone.
signal(SIGABRT, SIG_DFL);
abort(); abort();
return 0; return 0;
} }

2
init/subcontext_test.cpp
View file

@ -202,6 +202,8 @@ BuiltinFunctionMap BuildTestFunctionMap() {
// For RecoverAfterAbort // For RecoverAfterAbort
auto do_cause_log_fatal = [](const BuiltinArguments& args) -> Result<void> { 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'); return Error() << std::string(4097, 'f');
}; };
auto do_generate_sane_error = [](const BuiltinArguments& args) -> Result<void> { auto do_generate_sane_error = [](const BuiltinArguments& args) -> Result<void> {