about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2017-09-11 00:13:19 +0800
committerkennytm <kennytm@gmail.com>2017-09-12 17:28:07 +0800
commit143e2dcd5ce3a7ba5953378cde0f2850850d6e9f (patch)
treed3a968515453c9c04c03d8418498b0abd13eaabd
parent0bbe468271c3afa84c18979d8a5b9574d2bf2070 (diff)
downloadrust-143e2dcd5ce3a7ba5953378cde0f2850850d6e9f.tar.gz
rust-143e2dcd5ce3a7ba5953378cde0f2850850d6e9f.zip
Disable the new Hasher tests on Emscripten.
-rw-r--r--src/liballoc/tests/lib.rs3
-rw-r--r--src/libcore/tests/hash/mod.rs3
-rw-r--r--src/tools/tidy/src/pal.rs1
3 files changed, 7 insertions, 0 deletions
diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs
index 61377018455..c5beb63d12e 100644
--- a/src/liballoc/tests/lib.rs
+++ b/src/liballoc/tests/lib.rs
@@ -51,6 +51,9 @@ fn hash<T: Hash>(t: &T) -> u64 {
     s.finish()
 }
 
+// FIXME: Instantiated functions with i128 in the signature is not supported in Emscripten.
+// See https://github.com/kripken/emscripten-fastcomp/issues/169
+#[cfg(not(target_os = "emscripten"))]
 #[test]
 fn test_boxed_hasher() {
     let ordinary_hash = hash(&5u32);
diff --git a/src/libcore/tests/hash/mod.rs b/src/libcore/tests/hash/mod.rs
index 49e41f02428..e8ea6044f5f 100644
--- a/src/libcore/tests/hash/mod.rs
+++ b/src/libcore/tests/hash/mod.rs
@@ -110,6 +110,9 @@ fn test_custom_state() {
     assert_eq!(hash(&Custom { hash: 5 }), 5);
 }
 
+// FIXME: Instantiated functions with i128 in the signature is not supported in Emscripten.
+// See https://github.com/kripken/emscripten-fastcomp/issues/169
+#[cfg(not(target_os = "emscripten"))]
 #[test]
 fn test_indirect_hasher() {
     let mut hasher = MyHasher { hash: 0 };
diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs
index 8092a9e156b..fdbcfd10bde 100644
--- a/src/tools/tidy/src/pal.rs
+++ b/src/tools/tidy/src/pal.rs
@@ -76,6 +76,7 @@ const EXCEPTION_PATHS: &'static [&'static str] = &[
 
     // std testing crates, ok for now at least
     "src/libcore/tests",
+    "src/liballoc/tests/lib.rs",
 
     // non-std crates
     "src/test",