about summary refs log tree commit diff
path: root/src/liballoc/sync.rs
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2019-04-17 19:11:56 +0200
committerRalf Jung <post@ralfj.de>2019-04-18 13:37:14 +0200
commit29eed6b931c28cb30a42d80c0be11bc900fd356b (patch)
tree08fb73cb179f72af7a76e3ac50de3a0c67fb8fb0 /src/liballoc/sync.rs
parent3c3d3c1777041200bb7ed7a65b6562d62899778c (diff)
downloadrust-29eed6b931c28cb30a42d80c0be11bc900fd356b.tar.gz
rust-29eed6b931c28cb30a42d80c0be11bc900fd356b.zip
make liballoc internal test suite mostly pass in Miri
Diffstat (limited to 'src/liballoc/sync.rs')
-rw-r--r--src/liballoc/sync.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs
index b7d7995b540..466e806663c 100644
--- a/src/liballoc/sync.rs
+++ b/src/liballoc/sync.rs
@@ -1678,6 +1678,7 @@ mod tests {
 
     #[test]
     #[cfg_attr(target_os = "emscripten", ignore)]
+    #[cfg(not(miri))] // Miri does not support threads
     fn manually_share_arc() {
         let v = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
         let arc_v = Arc::new(v);
@@ -1982,6 +1983,7 @@ mod tests {
 
     #[test]
     #[cfg_attr(target_os = "emscripten", ignore)]
+    #[cfg(not(miri))] // Miri does not support threads
     fn test_weak_count_locked() {
         let mut a = Arc::new(atomic::AtomicBool::new(false));
         let a2 = a.clone();