From be874a468be821ea103bd380181abcb4ef6df6d0 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 4 May 2024 11:55:17 +0200 Subject: move available-parallelism tests into shims/ folder --- src/tools/miri/tests/pass/available-parallelism-miri-num-cpus.rs | 8 -------- src/tools/miri/tests/pass/available-parallelism.rs | 5 ----- .../miri/tests/pass/shims/available-parallelism-miri-num-cpus.rs | 8 ++++++++ src/tools/miri/tests/pass/shims/available-parallelism.rs | 5 +++++ 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 src/tools/miri/tests/pass/available-parallelism-miri-num-cpus.rs delete mode 100644 src/tools/miri/tests/pass/available-parallelism.rs create mode 100644 src/tools/miri/tests/pass/shims/available-parallelism-miri-num-cpus.rs create mode 100644 src/tools/miri/tests/pass/shims/available-parallelism.rs (limited to 'src/tools') diff --git a/src/tools/miri/tests/pass/available-parallelism-miri-num-cpus.rs b/src/tools/miri/tests/pass/available-parallelism-miri-num-cpus.rs deleted file mode 100644 index 137fa510249..00000000000 --- a/src/tools/miri/tests/pass/available-parallelism-miri-num-cpus.rs +++ /dev/null @@ -1,8 +0,0 @@ -//@compile-flags: -Zmiri-num-cpus=1024 - -use std::num::NonZeroUsize; -use std::thread::available_parallelism; - -fn main() { - assert_eq!(available_parallelism().unwrap(), NonZeroUsize::new(1024).unwrap()); -} diff --git a/src/tools/miri/tests/pass/available-parallelism.rs b/src/tools/miri/tests/pass/available-parallelism.rs deleted file mode 100644 index 77fb78424ba..00000000000 --- a/src/tools/miri/tests/pass/available-parallelism.rs +++ /dev/null @@ -1,5 +0,0 @@ -//@revisions: stack tree -//@[tree]compile-flags: -Zmiri-tree-borrows -fn main() { - assert_eq!(std::thread::available_parallelism().unwrap().get(), 1); -} diff --git a/src/tools/miri/tests/pass/shims/available-parallelism-miri-num-cpus.rs b/src/tools/miri/tests/pass/shims/available-parallelism-miri-num-cpus.rs new file mode 100644 index 00000000000..137fa510249 --- /dev/null +++ b/src/tools/miri/tests/pass/shims/available-parallelism-miri-num-cpus.rs @@ -0,0 +1,8 @@ +//@compile-flags: -Zmiri-num-cpus=1024 + +use std::num::NonZeroUsize; +use std::thread::available_parallelism; + +fn main() { + assert_eq!(available_parallelism().unwrap(), NonZeroUsize::new(1024).unwrap()); +} diff --git a/src/tools/miri/tests/pass/shims/available-parallelism.rs b/src/tools/miri/tests/pass/shims/available-parallelism.rs new file mode 100644 index 00000000000..77fb78424ba --- /dev/null +++ b/src/tools/miri/tests/pass/shims/available-parallelism.rs @@ -0,0 +1,5 @@ +//@revisions: stack tree +//@[tree]compile-flags: -Zmiri-tree-borrows +fn main() { + assert_eq!(std::thread::available_parallelism().unwrap().get(), 1); +} -- cgit 1.4.1-3-g733a5