Merge pull request #3085 from otavio/extend-gitignore

[rust.git] / ci / integration.sh

diff --git a/ci/integration.sh b/ci/integration.sh
index 0bce1671d4eed4c2ce99289da93a81d3fad476ee..b360b1468e2d45905eae181e26e19a0f16da4b16 100755 (executable)
--- a/ci/integration.sh
+++ b/ci/integration.sh
@@ -20,10 +20,19 @@ cargo install --force
 echo "Integration tests for: ${INTEGRATION}"
 cargo fmt -- --version
 
+# Checks that:
+#
+# * `cargo fmt --all` succeeds without any warnings or errors
+# * `cargo fmt --all -- --check` after formatting returns success
+# * `cargo test -all` still passes (formatting did not break the build)
 function check_fmt {
-    touch rustfmt.toml
-    cargo fmt --all -v 2>&1 | tee rustfmt_output
+    cargo test --all
     if [[ $? != 0 ]]; then
+          return 0
+    fi
+    touch rustfmt.toml
+    cargo fmt --all -v |& tee rustfmt_output
+    if [[ ${PIPESTATUS[0]} != 0 ]]; then
         cat rustfmt_output
         return 1
     fi
@@ -40,6 +49,11 @@ function check_fmt {
     if [[ $? != 0 ]]; then
         return 1
     fi
+    cargo fmt --all -- --check |& tee rustfmt_check_output
+    if [[ ${PIPESTATUS[0]} != 0 ]]; then
+        cat rustfmt_check_output
+        return 1
+    fi
     cargo test --all
     if [[ $? != 0 ]]; then
         return $?
@@ -54,12 +68,6 @@ case ${INTEGRATION} in
         check_fmt
         cd -
         ;;
-    failure)
-        git clone --depth=1 https://github.com/rust-lang-nursery/${INTEGRATION}.git
-        cd ${INTEGRATION}/failure-1.X
-        check_fmt
-        cd -
-        ;;
     *)
         git clone --depth=1 https://github.com/rust-lang-nursery/${INTEGRATION}.git
         cd ${INTEGRATION}