Auto merge of #4104 - Manishearth:beta-backports, r=flip1995

[rust.git] / ci / integration-tests.sh

diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh
index 9019a6830e6386d5efa8ed4353c1ac8e0b75e46f..1259c5e1d37892f8afdca72ade984611225fcd0e 100755 (executable)
--- a/ci/integration-tests.sh
+++ b/ci/integration-tests.sh
@@ -1,13 +1,3 @@
-# Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
-# file at the top-level directory of this distribution and at
-# http://rust-lang.org/COPYRIGHT.
-#
-# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
-
 set -x
 rm ~/.cargo/bin/cargo-clippy
 cargo install --force --path .
@@ -21,16 +11,13 @@ function check() {
 # run clippy on a project, try to be verbose and trigger as many warnings as possible for greater coverage
   RUST_BACKTRACE=full cargo clippy --all-targets --all-features -- --cap-lints warn -W clippy::pedantic -W clippy::nursery  &> clippy_output
   cat clippy_output
-  ! cat clippy_output | grep -q "internal compiler error\|query stack during panic"
+  ! cat clippy_output | grep -q "internal compiler error\|query stack during panic\|E0463"
   if [[ $? != 0 ]]; then
     return 1
   fi
 }
 
 case ${INTEGRATION} in
-  rust-lang/cargo)
-    check
-    ;;
   *)
     check
     ;;