mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #124681 - risc0:erik/fix-test, r=joboet

Browse Source 
zkvm: fix run_tests

`zkvm` is single-threaded, similar to `emscripten` and `wasm`. The `cfg` for `zkvm` seems to have been dropped. This PR adds the `cfg` again.
This commit is contained in:
Michael Goulet 2024-05-03 23:34:24 -04:00 committed by GitHub
commit 683197701c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/test/src/lib.rs
View File

@ -589,7 +589,9 @@ pub fn run_test(
// If the platform is single-threaded we're just going to run // If the platform is single-threaded we're just going to run
// the test synchronously, regardless of the concurrency // the test synchronously, regardless of the concurrency
// level. // level.
let supports_threads = !cfg!(target_os = "emscripten") && !cfg!(target_family = "wasm"); let supports_threads = !cfg!(target_os = "emscripten")
&& !cfg!(target_family = "wasm")
&& !cfg!(target_os = "zkvm");
if supports_threads { if supports_threads {
let cfg = thread::Builder::new().name(name.as_slice().to_owned()); let cfg = thread::Builder::new().name(name.as_slice().to_owned());
let mut runtest = Arc::new(Mutex::new(Some(runtest))); let mut runtest = Arc::new(Mutex::new(Some(runtest)));