about summary refs log tree commit diff
path: root/src/liballoc/tests
diff options
context:
space:
mode:
authorsnf <snf@users.noreply.github.com>2018-03-13 03:41:45 -0700
committersnf <snf@users.noreply.github.com>2018-03-14 03:48:42 -0700
commitb08b5ae0ec22e67d1cab7495865a0b34d4e6c5a2 (patch)
treee5eaee14c14cd878733d6d06623a1e2670dae968 /src/liballoc/tests
parent92bfcd2b192e59d12d64acf6f46c1897a3273b3e (diff)
downloadrust-b08b5ae0ec22e67d1cab7495865a0b34d4e6c5a2.tar.gz
rust-b08b5ae0ec22e67d1cab7495865a0b34d4e6c5a2.zip
try_reserve: disabling tests for asmjs, blocked by #48968
Diffstat (limited to 'src/liballoc/tests')
-rw-r--r--src/liballoc/tests/string.rs5
-rw-r--r--src/liballoc/tests/vec.rs7
-rw-r--r--src/liballoc/tests/vec_deque.rs8
3 files changed, 18 insertions, 2 deletions
diff --git a/src/liballoc/tests/string.rs b/src/liballoc/tests/string.rs
index d1e746ea43b..9bbba4e22b0 100644
--- a/src/liballoc/tests/string.rs
+++ b/src/liballoc/tests/string.rs
@@ -9,8 +9,11 @@
 // except according to those terms.
 
 use std::borrow::Cow;
+#[cfg(not(target_arch = "asmjs"))]
 use std::collections::CollectionAllocErr::*;
+#[cfg(not(target_arch = "asmjs"))]
 use std::mem::size_of;
+#[cfg(not(target_arch = "asmjs"))]
 use std::{usize, isize};
 
 pub trait IntoCow<'a, B: ?Sized> where B: ToOwned {
@@ -532,6 +535,7 @@ fn test_reserve_exact() {
     assert!(s.capacity() >= 33)
 }
 
+#[cfg(not(target_arch = "asmjs"))]
 #[test]
 fn test_try_reserve() {
 
@@ -609,6 +613,7 @@ fn test_try_reserve() {
 
 }
 
+#[cfg(not(target_arch = "asmjs"))]
 #[test]
 fn test_try_reserve_exact() {
 
diff --git a/src/liballoc/tests/vec.rs b/src/liballoc/tests/vec.rs
index 3c17a401bba..85e11d8b8ee 100644
--- a/src/liballoc/tests/vec.rs
+++ b/src/liballoc/tests/vec.rs
@@ -10,8 +10,11 @@
 
 use std::borrow::Cow;
 use std::mem::size_of;
-use std::{usize, isize, panic};
+use std::{usize, panic};
+#[cfg(not(target_arch = "asmjs"))]
+use std::isize;
 use std::vec::{Drain, IntoIter};
+#[cfg(not(target_arch = "asmjs"))]
 use std::collections::CollectionAllocErr::*;
 
 struct DropCounter<'a> {
@@ -991,6 +994,7 @@ fn test_reserve_exact() {
     assert!(v.capacity() >= 33)
 }
 
+#[cfg(not(target_arch = "asmjs"))]
 #[test]
 fn test_try_reserve() {
 
@@ -1093,6 +1097,7 @@ fn test_try_reserve() {
 
 }
 
+#[cfg(not(target_arch = "asmjs"))]
 #[test]
 fn test_try_reserve_exact() {
 
diff --git a/src/liballoc/tests/vec_deque.rs b/src/liballoc/tests/vec_deque.rs
index fc1a0b624a5..9fd38ed6f6f 100644
--- a/src/liballoc/tests/vec_deque.rs
+++ b/src/liballoc/tests/vec_deque.rs
@@ -11,9 +11,13 @@
 use std::collections::VecDeque;
 use std::fmt::Debug;
 use std::collections::vec_deque::{Drain};
+#[cfg(not(target_arch = "asmjs"))]
 use std::collections::CollectionAllocErr::*;
+#[cfg(not(target_arch = "asmjs"))]
 use std::mem::size_of;
-use std::{usize, isize};
+use std::isize;
+#[cfg(not(target_arch = "asmjs"))]
+use std::usize;
 
 use self::Taggy::*;
 use self::Taggypar::*;
@@ -1049,6 +1053,7 @@ fn test_reserve_exact_2() {
     assert!(v.capacity() >= 48)
 }
 
+#[cfg(not(target_arch = "asmjs"))]
 #[test]
 fn test_try_reserve() {
 
@@ -1150,6 +1155,7 @@ fn test_try_reserve() {
 
 }
 
+#[cfg(not(target_arch = "asmjs"))]
 #[test]
 fn test_try_reserve_exact() {