nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-04 11:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #94645 - RalfJung:available-parallelism-miri, r=the8472

Browse Source 
do not attempt to open cgroup files under Miri

Since https://github.com/rust-lang/rust/pull/92697, `cargo miri test` always fails under default flags, and one would have to use `MIRIFLAGS=-Zmiri-disable-isolation cargo miri test` instead. This PR fixes that problem.

Cc `@the8472` `@joshtriplett`
This commit is contained in:
Ralf Jung 2022-03-05 12:53:17 -05:00 committed by GitHub
commit 00fd87e68a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/std/src/sys/unix/thread.rs
View File

@ -384,6 +384,11 @@ fn cgroup2_quota() -> usize {
use crate::path::PathBuf; use crate::path::PathBuf;
let mut quota = usize::MAX; let mut quota = usize::MAX;
if cfg!(miri) {
// Attempting to open a file fails under default flags due to isolation.
// And Miri does not have parallelism anyway.
return quota;
}
let _: Option<()> = try { let _: Option<()> = try {
let mut buf = Vec::with_capacity(128); let mut buf = Vec::with_capacity(128);