X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.travis.yml;h=d699bd842eeccb031b041de681252282f7a229cd;hb=ea97ec5a4e822a55568ad6216f6aba56c03c464e;hp=2c82af7d218837c1837d57eca5aeecf7f6a16794;hpb=9226a50b14e2c25dacc0c83d5142f580d6608dae;p=rust.git

diff --git a/.travis.yml b/.travis.yml
index 2c82af7d218..d699bd842ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,52 +18,40 @@ matrix:
     - env: DEPLOY=LINUX
     - env: CFG_RELEASE_CHANNEL=beta
     - os: osx
-    - env: INTEGRATION=cargo
+    - env: INTEGRATION=bitflags
     - env: INTEGRATION=chalk
-    - env: INTEGRATION=rust-clippy
-    - env: INTEGRATION=mdbook
-    - env: INTEGRATION=stdsimd
     - env: INTEGRATION=crater
-    - env: INTEGRATION=futures-rs
-    - env: INTEGRATION=rand
-    - env: INTEGRATION=failure
     - env: INTEGRATION=error-chain
-    - env: INTEGRATION=bitflags
-    - env: INTEGRATION=log
     - env: INTEGRATION=glob
-    - env: INTEGRATION=tempdir
+    - env: INTEGRATION=log
+    - env: INTEGRATION=mdbook
+    - 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:
-    # PR sent
-    - env: INTEGRATION=crater
-    # #2721
+    # Using old configuration option
     - env: INTEGRATION=rand
-    # dues to a test failure (fails before Rustfmt'ing too)
-    - env: INTEGRATION=stdsimd
-    # Need to run an lalrpop build step before testing?
-    - env: INTEGRATION=chalk
-    # Doesn't build
+    # Doesn't build - keep this in allow_failures as it's fragile to breaking changes of rustc.
+    - env: INTEGRATION=rust-clippy
+    # 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
-
-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
+    # 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