Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 10 insertions, 11 deletions

diff --git a/third_party/rust/minidump-writer/tests/ptrace_dumper.rs b/third_party/rust/minidump-writer/tests/ptrace_dumper.rs
index 1be27f0809..6b62a4f6f3 100644
--- a/third_party/rust/minidump-writer/tests/ptrace_dumper.rs
+++ b/third_party/rust/minidump-writer/tests/ptrace_dumper.rs
@@ -7,7 +7,6 @@ use nix::sys::signal::Signal;
 use std::convert::TryInto;
 use std::io::{BufRead, BufReader};
 use std::mem::size_of;
-use std::os::unix::io::AsFd;
 use std::os::unix::process::ExitStatusExt;
 
 mod common;
@@ -29,7 +28,8 @@ fn test_thread_list_from_parent() {
     let num_of_threads = 5;
     let mut child = start_child_and_wait_for_threads(num_of_threads);
     let pid = child.id() as i32;
-    let mut dumper = PtraceDumper::new(pid).expect("Couldn't init dumper");
+    let mut dumper = PtraceDumper::new(pid, minidump_writer::minidump_writer::STOP_TIMEOUT)
+        .expect("Couldn't init dumper");
     assert_eq!(dumper.threads.len(), num_of_threads);
     dumper.suspend_threads().expect("Could not suspend threads");
 
@@ -129,20 +129,22 @@ fn test_merged_mappings() {
             map_size,
             ProtFlags::PROT_READ,
             MapFlags::MAP_SHARED,
-            Some(file.as_fd()),
+            &file,
             0,
         )
         .unwrap()
     };
 
+    let mapped = mapped_mem.as_ptr() as usize;
+
     // Carve a page out of the first mapping with different permissions.
     let _inside_mapping = unsafe {
         mmap(
-            std::num::NonZeroUsize::new(mapped_mem as usize + 2 * page_size.get()),
+            std::num::NonZeroUsize::new(mapped + 2 * page_size.get()),
             page_size,
             ProtFlags::PROT_NONE,
             MapFlags::MAP_SHARED | MapFlags::MAP_FIXED,
-            Some(file.as_fd()),
+            &file,
             // Map a different offset just to
             // better test real-world conditions.
             page_size.get().try_into().unwrap(), // try_into() in order to work for 32 and 64 bit
@@ -151,11 +153,7 @@ fn test_merged_mappings() {
 
     spawn_child(
         "merged_mappings",
-        &[
-            path,
-            &format!("{}", mapped_mem as usize),
-            &format!("{map_size}"),
-        ],
+        &[path, &format!("{mapped}"), &format!("{map_size}")],
     );
 }
 
@@ -209,7 +207,8 @@ fn test_sanitize_stack_copy() {
     let heap_addr = usize::from_str_radix(output.next().unwrap().trim_start_matches("0x"), 16)
         .expect("unable to parse mmap_addr");
 
-    let mut dumper = PtraceDumper::new(pid).expect("Couldn't init dumper");
+    let mut dumper = PtraceDumper::new(pid, minidump_writer::minidump_writer::STOP_TIMEOUT)
+        .expect("Couldn't init dumper");
     assert_eq!(dumper.threads.len(), num_of_threads);
     dumper.suspend_threads().expect("Could not suspend threads");
     let thread_info = dumper