Skip to content

Commit 829cb99

Browse files
committed
Slight tweak to test logic and fix the printf for mismatched addresses
1 parent b2e941d commit 829cb99

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ Status MinidumpFileBuilder::ReadWriteMemoryInChunks(
992992
// we'll error out of this Minidump generation.
993993
addDataError = Status::FromErrorStringWithFormat(
994994
"Unexpected address encounterd when reading memory in chunks "
995-
"0x" PRIx64 " expected 0x" PRIx64,
995+
"0x%" PRIx64 " expected 0x%" PRIx64,
996996
current_addr, addr + total_bytes_read);
997997
return lldb_private::IterationAction::Stop;
998998
}

lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump64b.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,10 @@ def verify_minidump(
6060
)
6161

6262
# Now we check if the error is the same, error isn't abnormal but they should fail for the same reason
63+
# Success will be false if they both fail
6364
self.assertTrue(
64-
(
65-
actual_process_read_error.Success()
66-
and expected_process_read_error.Success()
67-
)
68-
or (
69-
actual_process_read_error.Fail()
70-
and expected_process_read_error.Fail()
71-
),
65+
actual_process_read_error.Success()
66+
== expected_process_read_error.Success(),
7267
f"Address range {hex(start_addr)} - {hex(end_addr)} failed to read from live process and core for different reasons",
7368
)
7469
finally:

0 commit comments

Comments
 (0)