Skip to content

Commit

Permalink
[libtest] Run the test synchronously when hitting thread limit
Browse files Browse the repository at this point in the history
  • Loading branch information
hyd-dev committed Feb 17, 2021
1 parent 099f27b commit 43aed74
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 1 deletion.
13 changes: 12 additions & 1 deletion library/test/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,18 @@ 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());
Some(cfg.spawn(runtest).unwrap())
let mut runtest = Arc::new(Mutex::new(Some(runtest)));
let runtest2 = runtest.clone();
match cfg.spawn(move || runtest2.lock().unwrap().take().unwrap()()) {
Ok(handle) => Some(handle),
Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
// `ErrorKind::WouldBlock` means hitting the thread limit on some
// platforms, so run the test synchronously here instead.
Arc::get_mut(&mut runtest).unwrap().get_mut().unwrap().take().unwrap()();
None
}
Err(e) => panic!("failed to spawn thread to run test: {}", e),
}
} else {
runtest();
None
Expand Down
7 changes: 7 additions & 0 deletions src/test/run-make/libtest-thread-limit/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-include ../../run-make-fulldeps/tools.mk

# only-linux

all:
$(RUSTC) test.rs --test --target $(TARGET)
$(shell ulimit -p 0 && $(call RUN,test))
16 changes: 16 additions & 0 deletions src/test/run-make/libtest-thread-limit/test.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#![feature(once_cell)]

use std::{io::ErrorKind, lazy::SyncOnceCell, thread::{self, Builder, ThreadId}};

static THREAD_ID: SyncOnceCell<ThreadId> = SyncOnceCell::new();

#[test]
fn spawn_thread_would_block() {
assert_eq!(Builder::new().spawn(|| unreachable!()).unwrap_err().kind(), ErrorKind::WouldBlock);
THREAD_ID.set(thread::current().id()).unwrap();
}

#[test]
fn run_in_same_thread() {
assert_eq!(*THREAD_ID.get().unwrap(), thread::current().id());
}

0 comments on commit 43aed74

Please sign in to comment.