Merge pull request rust-lang#1963 from taiki-e/ci

Update and fix CI config

.travis.yml

@@ -25,20 +25,21 @@ matrix:
     # This is the minimum Rust version supported by `async-await` feature.
     # When updating this, the reminder to update the minimum required version of `async-await` feature in README.md.
     - name: cargo build --features async-await (minimum required version)
-      rust: beta # 1.39.0
+      rust: 1.39.0
       script:
         - cargo run --manifest-path ci/remove-dev-dependencies/Cargo.toml */Cargo.toml
-        - cargo build --all --features async-await
+        - cargo build --manifest-path futures/Cargo.toml --features async-await
 
     - name: cargo +stable build
       rust: stable
       script:
         - cargo run --manifest-path ci/remove-dev-dependencies/Cargo.toml */Cargo.toml
         # Check default-features
         - cargo build --all
-        # Check compat & thread-pool features
+        # Check compat & thread-pool & async-await features
         - cargo build --manifest-path futures/Cargo.toml --features io-compat
         - cargo build --manifest-path futures/Cargo.toml --features thread-pool
+        - cargo build --manifest-path futures/Cargo.toml --features async-await
 
     - name: cargo +beta build
       rust: beta

futures/tests/buffer_unordered.rs

@@ -6,7 +6,7 @@ use std::sync::mpsc as std_mpsc;
 use std::thread;
 
 #[test]
-#[cfg_attr(target_os = "macos", ignore)] // FIXME: https://github.com/rust-lang-nursery/futures-rs/issues/1790
+#[ignore] // FIXME: https://github.com/rust-lang-nursery/futures-rs/issues/1790
 fn works() {
     const N: usize = 4;