Skip to content

libtest: Don't panic if unable to spawn thread #78165

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

Closed
wants to merge 4 commits into from
Closed

libtest: Don't panic if unable to spawn thread #78165

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
472447c
libtest: Don't panic if unable to spawn thread
camelid Oct 20, 2020
77b68c5
Panic if error was not `WouldBlock`
camelid Oct 20, 2020
837b228
Update comment
camelid Oct 20, 2020
53e7072
Use `if let` instead of `match`
camelid Oct 20, 2020
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
12 changes: 11 additions & 1 deletion library/test/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,17 @@ pub fn run_test(
let supports_threads = !cfg!(target_os = "emscripten") && !cfg!(target_arch = "wasm32");
if concurrency == Concurrent::Yes && supports_threads {
let cfg = thread::Builder::new().name(name.as_slice().to_owned());
cfg.spawn(runtest).unwrap();
match cfg.spawn(runtest) {
Ok(_) => {}
Err(err @ io::Error { .. }) if err.kind() == io::ErrorKind::WouldBlock => {
// If spawning a new thread would block, and blocking was
// requested to not occur, just run the test synchronously.
runtest();
}
Err(err) => {
panic!("spawning a test thread failed: {}", err);
}
}
} else {
runtest();
}
Expand Down