Skip to content

GnuTests: remove LD_PRELOAD from nproc-quota.sh & avoid 0 period #13255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sylvestre merged 1 commit into from
Jul 4, 2026
+3 −2
Merged

GnuTests: remove LD_PRELOAD from nproc-quota.sh & avoid 0 period #13255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/uu/nproc/src/nproc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ fn cgroups2_quota() -> Option<usize> {
let mut pair = pair.split_whitespace();
// map the string "max" to None as we unwrap_or(usize::MAX) later
let quota = pair.next()?.parse::<usize>().ok()?;
let period = pair.next()?.parse::<usize>().ok()?;
debug_assert!(period > 0, "kernel should validate it");
// kernel does not provide 0 period. But it seems GNU cares about it
let period = pair.next()?.parse::<usize>().ok().filter(|&p| p > 0)?;
// mimic GNU's rounding
Some(quota.saturating_add(period / 2) / period)
}
Expand Down
1 change: 1 addition & 0 deletions util/fetch-gnu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ curl -L "${repo}/releases/download/v${ver}/coreutils-${ver}.tar.xz" | tar --stri
# TODO stop backporting tests from master at GNU coreutils > $ver
exit 0
backport=(
nproc/nproc-quota.sh # remove LD_PRELOAD
)
for f in "${backport[@]}"
do curl -L ${repo}/raw/refs/heads/master/tests/$f > tests/$f
Expand Down
Loading