Merge "debuggerd_test: fix invalid regexs" into main am: 562f953acd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984642 Change-Id: Ic245f648c8b4b41ce50263bad6a8c977b155fcc3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
e73c39f8eb
1 changed files with 3 additions and 3 deletions
|
@ -2647,7 +2647,7 @@ TEST_F(CrasherTest, fault_address_after_last_map) {
|
|||
match_str += format_full_pointer(crash_uptr);
|
||||
ASSERT_MATCH(result, match_str);
|
||||
|
||||
ASSERT_MATCH(result, R"(\nmemory map \(.*\): \(fault address prefixed with --->)\n)");
|
||||
ASSERT_MATCH(result, R"(\nmemory map \(.*\): \(fault address prefixed with --->\)\n)");
|
||||
|
||||
// Verifies that the fault address error message is at the end of the
|
||||
// maps section. To do this, the check below looks for the start of the
|
||||
|
@ -2699,7 +2699,7 @@ TEST_F(CrasherTest, fault_address_between_maps) {
|
|||
match_str += format_full_pointer(reinterpret_cast<uintptr_t>(middle_ptr));
|
||||
ASSERT_MATCH(result, match_str);
|
||||
|
||||
ASSERT_MATCH(result, R"(\nmemory map \(.*\): \(fault address prefixed with --->)\n)");
|
||||
ASSERT_MATCH(result, R"(\nmemory map \(.*\): \(fault address prefixed with --->\)\n)");
|
||||
|
||||
match_str = android::base::StringPrintf(
|
||||
R"( %s.*\n--->Fault address falls at %s between mapped regions\n %s)",
|
||||
|
@ -2737,7 +2737,7 @@ TEST_F(CrasherTest, fault_address_in_map) {
|
|||
match_str += format_full_pointer(reinterpret_cast<uintptr_t>(ptr));
|
||||
ASSERT_MATCH(result, match_str);
|
||||
|
||||
ASSERT_MATCH(result, R"(\nmemory map \(.*\): \(fault address prefixed with --->)\n)");
|
||||
ASSERT_MATCH(result, R"(\nmemory map \(.*\): \(fault address prefixed with --->\)\n)");
|
||||
|
||||
match_str = android::base::StringPrintf(R"(\n--->%s.*\n)", format_pointer(ptr).c_str());
|
||||
ASSERT_MATCH(result, match_str);
|
||||
|
|
Loading…
Reference in a new issue