Skip to content

Commit d55e4b7

Browse files
committed
test sort_unstable in Miri
1 parent 9b21324 commit d55e4b7

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

src/liballoc/tests/slice.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -468,16 +468,16 @@ fn test_sort() {
468468
#[test]
469469
fn test_sort_stability() {
470470
#[cfg(not(miri))] // Miri is too slow
471-
let large_limit = 510;
471+
let large_range = 500..510;
472472
#[cfg(not(miri))] // Miri is too slow
473473
let rounds = 10;
474474

475475
#[cfg(miri)]
476-
let large_limit = 500; // effectively skips the large tests
476+
let large_range = 0..0; // empty range
477477
#[cfg(miri)]
478478
let rounds = 1;
479479

480-
for len in (2..25).chain(500..large_limit) {
480+
for len in (2..25).chain(large_range) {
481481
for _ in 0..rounds {
482482
let mut counts = [0; 10];
483483

src/libcore/tests/slice.rs

+12-3
Original file line numberDiff line numberDiff line change
@@ -1024,22 +1024,31 @@ fn test_rotate_right() {
10241024

10251025
#[test]
10261026
#[cfg(not(target_arch = "wasm32"))]
1027-
#[cfg(not(miri))] // Miri is too slow
10281027
fn sort_unstable() {
10291028
use core::cmp::Ordering::{Equal, Greater, Less};
10301029
use core::slice::heapsort;
10311030
use rand::{FromEntropy, Rng, rngs::SmallRng, seq::SliceRandom};
10321031

1032+
#[cfg(not(miri))] // Miri is too slow
1033+
let large_range = 500..510;
1034+
#[cfg(not(miri))] // Miri is too slow
1035+
let rounds = 100;
1036+
1037+
#[cfg(miri)]
1038+
let large_range = 0..0; // empty range
1039+
#[cfg(miri)]
1040+
let rounds = 1;
1041+
10331042
let mut v = [0; 600];
10341043
let mut tmp = [0; 600];
10351044
let mut rng = SmallRng::from_entropy();
10361045

1037-
for len in (2..25).chain(500..510) {
1046+
for len in (2..25).chain(large_range) {
10381047
let v = &mut v[0..len];
10391048
let tmp = &mut tmp[0..len];
10401049

10411050
for &modulus in &[5, 10, 100, 1000] {
1042-
for _ in 0..100 {
1051+
for _ in 0..rounds {
10431052
for i in 0..len {
10441053
v[i] = rng.gen::<i32>() % modulus;
10451054
}

0 commit comments

Comments
 (0)