diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-04-24 13:14:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 13:14:26 +0200 |
| commit | 08ca4472679057539e71fdb78b9e45e74c6932db (patch) | |
| tree | 93240efca356cd1318e475709d0de0750f5ba0d5 /src/liballoc/tests/slice.rs | |
| parent | aa9053a3e76ecf2a35fecee5e83e5b27582cf9df (diff) | |
| parent | eb1de2ff39de631e9fd880f1e066fbe119b23f99 (diff) | |
Rollup merge of #71476 - RalfJung:miri-test-sizes, r=kennytm
more compact way to adjust test sizes for Miri Inspired by @dtolnay
Diffstat (limited to 'src/liballoc/tests/slice.rs')
| -rw-r--r-- | src/liballoc/tests/slice.rs | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/liballoc/tests/slice.rs b/src/liballoc/tests/slice.rs index 8e49e6d8eba..75b76bb73ed 100644 --- a/src/liballoc/tests/slice.rs +++ b/src/liballoc/tests/slice.rs @@ -463,15 +463,9 @@ fn test_sort() { #[test] fn test_sort_stability() { - #[cfg(not(miri))] // Miri is too slow - let large_range = 500..510; - #[cfg(not(miri))] // Miri is too slow - let rounds = 10; - - #[cfg(miri)] - let large_range = 0..0; // empty range - #[cfg(miri)] - let rounds = 1; + // Miri is too slow + let large_range = if cfg!(miri) { 0..0 } else { 500..510 }; + let rounds = if cfg!(miri) { 1 } else { 10 }; for len in (2..25).chain(large_range) { for _ in 0..rounds { @@ -1727,15 +1721,9 @@ fn panic_safe() { let mut rng = thread_rng(); - #[cfg(not(miri))] // Miri is too slow - let lens = (1..20).chain(70..MAX_LEN); - #[cfg(not(miri))] // Miri is too slow - let moduli = &[5, 20, 50]; - - #[cfg(miri)] - let lens = 1..10; - #[cfg(miri)] - let moduli = &[5]; + // Miri is too slow + let lens = if cfg!(miri) { (1..10).chain(20..21) } else { (1..20).chain(70..MAX_LEN) }; + let moduli: &[u32] = if cfg!(miri) { &[5] } else { &[5, 20, 50] }; for len in lens { for &modulus in moduli { |
