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

Commit 38ab0453 authored by Mattias Simonsson's avatar Mattias Simonsson Committed by Christopher Ferris
Browse files

debuggerd_test: Scale timeouts by HwTimeoutMultiplier 

Timeouts in tombstoned.cpp and intercept_manager.cpp are scaled
by HwTimeoutMultiplier, but the timeouts in debuggerd_test.cpp
are not, which means the CrasherTest#intercept_timeout test will
fail for any platform that has a high enough HwTimeoutMultiplier.

Bug: 309532789
Test: debuggerd_test.CrasherTest#intercept_timeout
Change-Id: I83cd01e87644c011efa155a32fd5d92cc8a43a95
parent 14270410

debuggerd/debuggerd_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ constexpr char kWaitForDebuggerKey[] = "debug.debuggerd.wait_for_debugger"; 
    if (sigaction(SIGALRM, &new_sigaction, &old_sigaction) != 0) { \

      err(1, "sigaction failed");                                  \

    }                                                              \

    alarm(seconds);                                                \

    alarm(seconds * android::base::HwTimeoutMultiplier());         \

    auto value = expr;                                             \

    int saved_errno = errno;                                       \

    if (sigaction(SIGALRM, &old_sigaction, nullptr) != 0) {        \