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

Merge "debuggerd_test: fix invalid regexs" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-03-01 01:54:51 +00:00 • committed by Gerrit Code Review
commit 562f953acd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debuggerd/debuggerd_test.cpp
View file

@ -2647,7 +2647,7 @@ TEST_F(CrasherTest, fault_address_after_last_map) {
match_str += format_full_pointer(crash_uptr); match_str += format_full_pointer(crash_uptr);
ASSERT_MATCH(result, match_str); 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 // 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 // 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)); match_str += format_full_pointer(reinterpret_cast<uintptr_t>(middle_ptr));
ASSERT_MATCH(result, match_str); 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( match_str = android::base::StringPrintf(
R"( %s.*\n--->Fault address falls at %s between mapped regions\n %s)", 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)); match_str += format_full_pointer(reinterpret_cast<uintptr_t>(ptr));
ASSERT_MATCH(result, match_str); 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()); match_str = android::base::StringPrintf(R"(\n--->%s.*\n)", format_pointer(ptr).c_str());
ASSERT_MATCH(result, match_str); ASSERT_MATCH(result, match_str);