about summary refs log tree commit diff
path: root/src/liballoc/alloc.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-19 12:52:02 +0000
committerbors <bors@rust-lang.org>2019-04-19 12:52:02 +0000
commita2bbf7debaab60be33bd8008a71bca69576945a0 (patch)
treebf380d261dcaf281e9b606cd74117a1d406a07e0 /src/liballoc/alloc.rs
parent22fa4bb0ebdfe9fcd7962f1fa6e758c036c878e6 (diff)
parent2bc8c547cdd9cd2e4f338477eea5860861879565 (diff)
downloadrust-a2bbf7debaab60be33bd8008a71bca69576945a0.tar.gz
rust-a2bbf7debaab60be33bd8008a71bca69576945a0.zip
Auto merge of #60077 - RalfJung:miri-alloc-tests, r=joshtriplett
make liballoc internal test suite mostly pass in Miri

I discovered, to my surprise, that liballoc has two test suites: `liballoc/tests`, and a bunch of stuff embedded directly within liballoc.  The latter was not covered by [miri-test-libstd](https://github.com/RalfJung/miri-test-libstd) yet.  This disables in Miri the tests that Miri cannot support or runs too slowly.
Diffstat (limited to 'src/liballoc/alloc.rs')
-rw-r--r--src/liballoc/alloc.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs
index f3877e51a66..ddc6481eec7 100644
--- a/src/liballoc/alloc.rs
+++ b/src/liballoc/alloc.rs
@@ -252,6 +252,7 @@ mod tests {
     }
 
     #[bench]
+    #[cfg(not(miri))] // Miri does not support benchmarks
     fn alloc_owned_small(b: &mut Bencher) {
         b.iter(|| {
             let _: Box<_> = box 10;