tests/inst: Drop nix dependency
It has various semver bumps and we were literally just using it to duplicate what's already in `libc`.
This commit is contained in:
1 parent
180a1d8f0a
commit
c0beedbb48
3 files changed
+5
-6
No files matched your search
@@ -52,6 +52,6 @@ pub(crate) fn itest_tmpfiles() -> Result<()> {
|
||||
return Ok(());
|
||||
}
|
||||
let metadata = Path::new("/run/ostree").metadata()?;
|
||||
assert_eq!(metadata.permissions().mode() & !nix::libc::S_IFMT, 0o755);
|
||||
assert_eq!(metadata.permissions().mode() & !libc::S_IFMT, 0o755);
|
||||
Ok(())
|
||||
}
|
||||
@@ -75,7 +75,6 @@ pub(crate) fn mutate_one_executable_to(
|
||||
|
||||
/// Find ELF files in the srcdir, write new copies to dest (only percentage)
|
||||
pub(crate) fn mutate_executables_to(src: &Dir, dest: &Dir, percentage: u32) -> Result<u32> {
|
||||
use nix::sys::stat::Mode as NixMode;
|
||||
assert!(percentage > 0 && percentage <= 100);
|
||||
let mut mutated = 0;
|
||||
for entry in src.entries()? {
|
||||
@@ -84,13 +83,13 @@ pub(crate) fn mutate_executables_to(src: &Dir, dest: &Dir, percentage: u32) -> R
|
||||
continue;
|
||||
}
|
||||
let meta = entry.metadata()?;
|
||||
let mode = NixMode::from_bits_truncate(meta.mode());
|
||||
let mode = meta.mode();
|
||||
// Must be executable
|
||||
if !mode.intersects(NixMode::S_IXUSR | NixMode::S_IXGRP | NixMode::S_IXOTH) {
|
||||
if mode & (libc::S_IXUSR | libc::S_IXGRP | libc::S_IXOTH) == 0 {
|
||||
continue;
|
||||
}
|
||||
// Not suid
|
||||
if mode.intersects(NixMode::S_ISUID | NixMode::S_ISGID) {
|
||||
if mode & (libc::S_ISUID | libc::S_ISGID) == 0 {
|
||||
continue;
|
||||
}
|
||||
// Greater than 1k in size
|
||||
|
||||
Reference in new issue
Block a user