Auto merge of #4720 - lzutao:int-errexit, r=phansch

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

diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh
index 1259c5e1d37892f8afdca72ade984611225fcd0e..16098c50ec452cd90e7db61e1bf1800f874f6b60 100755 (executable)
--- a/ci/integration-tests.sh
+++ b/ci/integration-tests.sh
@@ -1,24 +1,35 @@
-set -x
+#!/usr/bin/env bash
+set -ex
+
+if [[ -z "$INTEGRATION" ]]; then
+    exit 0
+fi
+
+CARGO_TARGET_DIR=$(pwd)/target/
+export CARGO_TARGET_DIR
+
 rm ~/.cargo/bin/cargo-clippy
-cargo install --force --path .
+cargo install --force --debug --path .
 
 echo "Running integration test for crate ${INTEGRATION}"
 
-git clone --depth=1 https://github.com/${INTEGRATION}.git checkout
+git clone --depth=1 "https://github.com/${INTEGRATION}.git" checkout
 cd checkout
 
-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\|E0463"
-  if [[ $? != 0 ]]; then
-    return 1
-  fi
-}
-
-case ${INTEGRATION} in
-  *)
-    check
-    ;;
-esac
+# 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 2>&1 || true
+
+cat clippy_output
+
+if grep -q "internal compiler error\|query stack during panic\|E0463" clippy_output; then
+    exit 1
+fi