diff options
| author | bors <bors@rust-lang.org> | 2020-04-09 20:03:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-09 20:03:54 +0000 |
| commit | 94d346360da50f159e0dc777dc9bc3c5b6b51a00 (patch) | |
| tree | dab641f94d87557dba0291edc8c852c85f8e6543 /src/liballoc/tests/string.rs | |
| parent | 93dc97a85381cc52eb872d27e50e4d518926a27c (diff) | |
| parent | 2c3147f018d8b6c05940b66e9f6098737277c882 (diff) | |
| download | rust-94d346360da50f159e0dc777dc9bc3c5b6b51a00.tar.gz rust-94d346360da50f159e0dc777dc9bc3c5b6b51a00.zip | |
Auto merge of #70960 - Centril:rollup-9vmokvw, r=Centril
Rollup of 5 pull requests Successful merges: - #70897 (bump Miri) - #70900 (Update cargo) - #70902 (Update Clippy) - #70939 (Add two const generics regression tests) - #70958 (Disable try_reserve tests on Android) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc/tests/string.rs')
| -rw-r--r-- | src/liballoc/tests/string.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/liballoc/tests/string.rs b/src/liballoc/tests/string.rs index 6e2a5abe90d..9ea020d2d19 100644 --- a/src/liballoc/tests/string.rs +++ b/src/liballoc/tests/string.rs @@ -555,6 +555,7 @@ fn test_reserve_exact() { #[test] #[cfg_attr(miri, ignore)] // Miri does not support signalling OOM +#[cfg_attr(target_os = "android", ignore)] // Android used in CI has a broken dlmalloc fn test_try_reserve() { // These are the interesting cases: // * exactly isize::MAX should never trigger a CapacityOverflow (can be OOM) @@ -644,6 +645,7 @@ fn test_try_reserve() { #[test] #[cfg_attr(miri, ignore)] // Miri does not support signalling OOM +#[cfg_attr(target_os = "android", ignore)] // Android used in CI has a broken dlmalloc fn test_try_reserve_exact() { // This is exactly the same as test_try_reserve with the method changed. // See that test for comments. |