about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-01-19 15:49:36 -0800
committerAlex Crichton <alex@alexcrichton.com>2017-01-20 08:35:47 -0800
commitb17492082756a223f503266f54300f81012f8aca (patch)
tree9cefad4f2929d5cab10b60eb059d950d5cf4d491 /src/libstd
parent17294d98b915364f64a8a1cbc071aa6ee200a03b (diff)
parente8f9d2d43a190074d52a0df40725ebd2c0fb0a9e (diff)
downloadrust-b17492082756a223f503266f54300f81012f8aca.tar.gz
rust-b17492082756a223f503266f54300f81012f8aca.zip
Rollup merge of #39120 - alexcrichton:emscripten-tests, r=brson
travis: Get an emscripten builder online

This commit adds a new entry to the Travis matrix which will execute emscripten
test suites. Along the way it updates a few bits of the test suite to continue
passing on emscripten, such as:

* Ignoring i128/u128 tests as they're presumably just not working (didn't
  investigate as to why)
* Disabling a few process tests (not working on emscripten)
* Ignore some num tests in libstd (#39119)
* Fix some warnings when compiling
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/net/test.rs2
-rw-r--r--src/libstd/num.rs1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/net/test.rs b/src/libstd/net/test.rs
index 3f2eacda7d6..aec3d901ece 100644
--- a/src/libstd/net/test.rs
+++ b/src/libstd/net/test.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(dead_code)] // not used on emscripten
+#![allow(warnings)] // not used on emscripten
 
 use env;
 use net::{SocketAddr, SocketAddrV4, SocketAddrV6, Ipv4Addr, Ipv6Addr, ToSocketAddrs};
diff --git a/src/libstd/num.rs b/src/libstd/num.rs
index d1c2fc3d3fc..5f83d077a13 100644
--- a/src/libstd/num.rs
+++ b/src/libstd/num.rs
@@ -172,6 +172,7 @@ mod tests {
 
     macro_rules! test_checked_next_power_of_two {
         ($test_name:ident, $T:ident) => (
+            #[cfg_attr(target_os = "emscripten", ignore)] // FIXME(#39119)
             fn $test_name() {
                 #![test]
                 assert_eq!((0 as $T).checked_next_power_of_two(), Some(1));