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

Commit de8b9c5e authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Expect optional (offset ...) in frame dump." 

am: 4578d132

Change-Id: I0e49ba91d508f0b63ee2bb1019dba4461df25537
parents 421a05dd 4578d132

debuggerd/debuggerd_test.cpp

+6 −1
Original line number Diff line number Diff line
@@ -80,8 +80,13 @@ constexpr char kWaitForGdbKey[] = "debug.debuggerd.wait_for_gdb"; 
    return value;                                                  \

  }()



// Backtrace frame dump could contain:

//   #01 pc 0001cded  /data/tmp/debuggerd_test32 (raise_debugger_signal+80)

// or

//   #01 pc 00022a09  /data/tmp/debuggerd_test32 (offset 0x12000) (raise_debugger_signal+80)

#define ASSERT_BACKTRACE_FRAME(result, frame_name) \

  ASSERT_MATCH(result, R"(#\d\d pc [0-9a-f]+\s+ \S+ \()" frame_name R"(\+)");

  ASSERT_MATCH(result,                             \

               R"(#\d\d pc [0-9a-f]+\s+ \S+ (\(offset 0x[0-9a-f]+\) )?\()" frame_name R"(\+)");



static void tombstoned_intercept(pid_t target_pid, unique_fd* intercept_fd, unique_fd* output_fd,

                                 InterceptStatus* status, DebuggerdDumpType intercept_type) {