X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.travis.yml;h=d699bd842eeccb031b041de681252282f7a229cd;hb=2b6226ce497ce9b3b9a0a3fe22a707fefcd8c2ee;hp=21dfc6c7bec27d7f3907d37aa608d544bb11a64d;hpb=9038da6df0a11a55255a7ea562d91d1e93679252;p=rust.git

diff --git a/.travis.yml b/.travis.yml
index 21dfc6c7bec..d699bd842ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,50 +19,39 @@ matrix:
     - env: CFG_RELEASE_CHANNEL=beta
     - os: osx
     - env: INTEGRATION=bitflags
-    - env: INTEGRATION=cargo
     - env: INTEGRATION=chalk
     - env: INTEGRATION=crater
     - env: INTEGRATION=error-chain
-    - env: INTEGRATION=failure
-    - env: INTEGRATION=futures-rs
     - env: INTEGRATION=glob
     - env: INTEGRATION=log
     - env: INTEGRATION=mdbook
-    - env: INTEGRATION=rand
-    - env: INTEGRATION=rust-clippy
+    - env: INTEGRATION=packed_simd
     - env: INTEGRATION=rust-semverver
+    - env: INTEGRATION=stdsimd TARGET=x86_64-unknown-linux-gnu
     - env: INTEGRATION=tempdir
+    - env: INTEGRATION=futures-rs
   allow_failures:
-    # See: https://github.com/rust-lang-nursery/rustfmt/issues/2789
-    - env: INTEGRATION=chalk
-    # PR sent
-    - env: INTEGRATION=crater
-    # #2721
+    # Using old configuration option
     - env: INTEGRATION=rand
-    # Doesn't build
+    # Doesn't build - keep this in allow_failures as it's fragile to breaking changes of rustc.
     - env: INTEGRATION=rust-clippy
-    # See: https://github.com/rust-lang-nursery/rustfmt/issues/2787
-    - env: INTEGRATION=stdsimd
-
-before_script:
-- |
-  if [ -z ${INTEGRATION} ]; then
-    if [ $TRAVIS_OS_NAME = 'osx' ]; then
-      virtualenv env &&
-      source env/bin/activate &&
-      python --version &&
-      pip install 'travis-cargo<0.2'
-    else
-      pip install 'travis-cargo<0.2' --user &&
-      export PATH="$(python -m site --user-base)/bin:$PATH"
-    fi
-  fi
+    # Doesn't build - seems to be because of an option
+    - env: INTEGRATION=packed_simd
+    # Doesn't build - a temporal build failure due to breaking changes in the nightly compilre
+    - env: INTEGRATION=rust-semverver
+    # can be moved back to include section after https://github.com/rust-lang-nursery/failure/pull/298 is merged
+    - env: INTEGRATION=failure
+    # `cargo test` doesn't finish - disabling for now.
+    # - env: INTEGRATION=cargo
 
 script:
   - |
     if [ -z ${INTEGRATION} ]; then
+      export CFG_RELEASE_CHANNEL=nightly
+      export CFG_RELEASE=nightly
       cargo build
       cargo test
+      cargo test -- --ignored
     else
       ./ci/integration.sh
     fi