Skip to content

Commit

Permalink
Merge pull request #7385 from dezgeg/build-fix
Browse files Browse the repository at this point in the history
uucore: Fix proc_info compilation
  • Loading branch information
sylvestre authored Mar 3, 2025
2 parents 8b6bd7c + 8f119fb commit 439b146
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/uucore/src/lib/features/proc_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ mod tests {

#[test]
fn test_thread_ids() {
let main_tid = unsafe { uucore::libc::gettid() };
let main_tid = unsafe { crate::libc::gettid() };
std::thread::spawn(move || {
let mut pid_entry = ProcessInformation::try_new(
PathBuf::from_str(&format!("/proc/{}", current_pid())).unwrap(),
Expand All @@ -482,7 +482,7 @@ mod tests {

assert!(thread_ids.contains(&(main_tid as usize)));

let new_thread_tid = unsafe { uucore::libc::gettid() };
let new_thread_tid = unsafe { crate::libc::gettid() };
assert!(thread_ids.contains(&(new_thread_tid as usize)));
})
.join()
Expand All @@ -507,9 +507,9 @@ mod tests {
PathBuf::from_str(&format!("/proc/{}", current_pid())).unwrap(),
)
.unwrap();
assert_eq!(pid_entry.uid().unwrap(), uucore::process::getuid());
assert_eq!(pid_entry.euid().unwrap(), uucore::process::geteuid());
assert_eq!(pid_entry.gid().unwrap(), uucore::process::getgid());
assert_eq!(pid_entry.egid().unwrap(), uucore::process::getegid());
assert_eq!(pid_entry.uid().unwrap(), crate::process::getuid());
assert_eq!(pid_entry.euid().unwrap(), crate::process::geteuid());
assert_eq!(pid_entry.gid().unwrap(), crate::process::getgid());
assert_eq!(pid_entry.egid().unwrap(), crate::process::getegid());
}
}

0 comments on commit 439b146

Please sign in to comment.