Deny warnings in CI

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 130a7f1fa6d61277fe4cd20d7c2ada7858c4d1f2..ee990111af96aed85cd643bb847937c8090c42e5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,9 +51,8 @@ matrix:
     # 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
-    # disabled cargo integration test due to https://github.com/rust-lang/rust-clippy/issues/4121
-    #- env: INTEGRATION=rust-lang/cargo
-    #  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
@@ -98,7 +97,7 @@ script:
       export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
   - |
     if [ -z ${INTEGRATION} ]; then
-      ./ci/base-tests.sh && sleep 5
+      travis_wait 30 ./ci/base-tests.sh && sleep 5
     else
       ./ci/integration-tests.sh && sleep 5
     fi