diff options
| author | Ralf Jung <post@ralfj.de> | 2019-12-07 12:42:19 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2019-12-07 12:42:19 +0100 |
| commit | ca2ffe3a8030e0fb6593cb6905a371441a10a4e0 (patch) | |
| tree | 45b55f5202af5b3582b7f621ac937e1cb8d44dfa /src/liballoc/tests/str.rs | |
| parent | 7ba1232b5ea8f6ab011efe2ce3fb97d955342fdb (diff) | |
| download | rust-ca2ffe3a8030e0fb6593cb6905a371441a10a4e0.tar.gz rust-ca2ffe3a8030e0fb6593cb6905a371441a10a4e0.zip | |
liballoc: ignore tests in Miri instead of removing them entirely
Diffstat (limited to 'src/liballoc/tests/str.rs')
| -rw-r--r-- | src/liballoc/tests/str.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/liballoc/tests/str.rs b/src/liballoc/tests/str.rs index cb73c7c179c..1b011242d01 100644 --- a/src/liballoc/tests/str.rs +++ b/src/liballoc/tests/str.rs @@ -166,7 +166,7 @@ fn test_join_for_different_lengths_with_long_separator() { } #[test] -#[cfg(not(miri))] // Miri is too slow +#[cfg_attr(miri, ignore)] // Miri is too slow fn test_unsafe_slice() { assert_eq!("ab", unsafe {"abc".get_unchecked(0..2)}); assert_eq!("bc", unsafe {"abc".get_unchecked(1..3)}); @@ -483,8 +483,8 @@ mod slice_index { } #[test] - #[cfg(not(target_os = "emscripten"))] // hits an OOM - #[cfg(not(miri))] // Miri is too slow + #[cfg_attr(target_os = "emscripten", ignore)] // hits an OOM + #[cfg_attr(miri, ignore)] // Miri is too slow fn simple_big() { fn a_million_letter_x() -> String { let mut i = 0; @@ -1069,7 +1069,7 @@ fn test_rev_iterator() { } #[test] -#[cfg(not(miri))] // Miri is too slow +#[cfg_attr(miri, ignore)] // Miri is too slow fn test_chars_decoding() { let mut bytes = [0; 4]; for c in (0..0x110000).filter_map(std::char::from_u32) { @@ -1081,7 +1081,7 @@ fn test_chars_decoding() { } #[test] -#[cfg(not(miri))] // Miri is too slow +#[cfg_attr(miri, ignore)] // Miri is too slow fn test_chars_rev_decoding() { let mut bytes = [0; 4]; for c in (0..0x110000).filter_map(std::char::from_u32) { @@ -1380,7 +1380,6 @@ fn test_bool_from_str() { assert_eq!("not even a boolean".parse::<bool>().ok(), None); } -#[cfg(not(miri))] // Miri is too slow fn check_contains_all_substrings(s: &str) { assert!(s.contains("")); for i in 0..s.len() { @@ -1391,7 +1390,7 @@ fn check_contains_all_substrings(s: &str) { } #[test] -#[cfg(not(miri))] // Miri is too slow +#[cfg_attr(miri, ignore)] // Miri is too slow fn strslice_issue_16589() { assert!("bananas".contains("nana")); @@ -1408,7 +1407,7 @@ fn strslice_issue_16878() { #[test] -#[cfg(not(miri))] // Miri is too slow +#[cfg_attr(miri, ignore)] // Miri is too slow fn test_strslice_contains() { let x = "There are moments, Jeeves, when one asks oneself, 'Do trousers matter?'"; check_contains_all_substrings(x); |
