build: re-enable stdsimd integration test

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index f707e622ad87e65cdb3d9f24da078b52bbd8705b..b07ebe501c7697ec71245c7d287e6675fe2ac6c3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ cache:
     - $HOME/.cargo
 before_cache:
   - cargo install -Z install-upgrade cargo-cache --debug
+  - find $HOME/.cargo/bin/ ! -type d -exec strip {} \;
   - cargo cache --autoclean
 
 env:
@@ -47,26 +48,25 @@ matrix:
   include:
     # Builds that are executed for every PR
     - os: osx # run base tests on both platforms
-      env: BASE_TESTS=true
     - os: linux
-      env: BASE_TESTS=true
     - os: windows
-      env: CARGO_INCREMENTAL=0 BASE_TESTS=true OS_WINDOWS=true
+      env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
 
     # Builds that are only executed when a PR is r+ed or a try build is started
     # We don't want to run these always because they go towards
     # the build limit within the Travis rust-lang account.
     # The jobs are approximately sorted by execution time
+    - env: INTEGRATION=rust-lang/rls
+      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=rust-lang/cargo
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=rust-lang-nursery/chalk
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-lang/rls
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=Geal/nom
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-lang/rustfmt
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
+    # FIXME blocked on https://github.com/rust-lang/rust-clippy/issues/4727
+    #- env: INTEGRATION=rust-lang/rustfmt
+    #  if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=hyperium/hyper
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=bluss/rust-itertools
@@ -89,7 +89,7 @@ matrix:
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
   allow_failures:
     - os: windows
-      env: CARGO_INCREMENTAL=0 BASE_TESTS=true OS_WINDOWS=true
+      env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
 
 before_script:
   - |
@@ -110,18 +110,23 @@ before_script:
     rm rust-toolchain
     ./setup-toolchain.sh
   - |
-    if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
-      export PATH=$PATH:$(rustc --print sysroot)/bin
-    else
-      export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
-    fi
+    SYSROOT=$(rustc --print sysroot)
+    case "$TRAVIS_OS_NAME" in
+      windows ) export PATH="${SYSROOT}/bin:${PATH}" ;;
+      linux ) export LD_LIBRARY_PATH="${SYSROOT}/lib" ;;
+      osx )
+        # See <https://github.com/nteract/nteract/issues/1523#issuecomment-301623519>
+        sudo mkdir -p /usr/local/lib
+        sudo find "$SYSROOT/lib" -maxdepth 1 -name '*.dylib' -exec ln -s {} /usr/local/lib \;
+        ;;
+    esac
 
 script:
   - |
     if [[ -n ${INTEGRATION} ]]; then
       ./ci/integration-tests.sh && sleep 5
     else
-      travis_wait 30 ./ci/base-tests.sh && sleep 5
+      ./ci/base-tests.sh && sleep 5
     fi
 
 after_success: