Try and run less when doing integration tests

And emit rustfmt output so they can be debugged

Author: nrc

.travis.yml

@@ -33,8 +33,6 @@ matrix:
     - env: INTEGRATION=log
   allow_failures:
     - env: INTEGRATION=cargo
-    - env: INTEGRATION=stdsimd
-    - env: INTEGRATION=mdbook
     - env: INTEGRATION=crater
     - env: INTEGRATION=rust-semverver
     - env: INTEGRATION=rust-clippy

ci/integration.sh

@@ -4,9 +4,6 @@ set -ex
 
 : ${INTEGRATION?"The INTEGRATION environment variable must be set."}
 
-# FIXME: this is causing the build to fail when rustfmt is found in .cargo/bin
-# but cargo-fmt is not found.
-#
 # `which rustfmt` fails if rustfmt is not found. Since we don't install
 # `rustfmt` via `rustup`, this is the case unless we manually install it. Once
 # that happens, `cargo install --force` will be called, which installs
@@ -15,8 +12,8 @@ set -ex
 # here after the first installation will find `rustfmt` and won't need to build
 # it again.
 #
-# which rustfmt || cargo install --force
-cargo install --force
+which cargo-fmt || cargo install --force
+# cargo install --force
 
 echo "Integration tests for: ${INTEGRATION}"
 
@@ -39,41 +36,25 @@ function check_fmt {
     if [[ $? != 0 ]]; then
         return 1
     fi
-    cargo test --all
-    if [[ $? != 0 ]]; then
-        return $?
-    fi
-}
-
-function check {
-    cargo test --all
-    if [[ $? != 0 ]]; then
-        return 1
-    fi
-    check_fmt
-    if [[ $? != 0 ]]; then
-        return 1
-    fi
 }
 
 case ${INTEGRATION} in
     cargo)
         git clone --depth=1 https://github.com/rust-lang/${INTEGRATION}.git
         cd ${INTEGRATION}
-        export CFG_DISABLE_CROSS_TESTS=1
-        check
+        check_fmt
         cd -
         ;;
     failure)
         git clone --depth=1 https://github.com/rust-lang-nursery/${INTEGRATION}.git
         cd ${INTEGRATION}/failure-1.X
-        check
+        check_fmt
         cd -
         ;;
     *)
         git clone --depth=1 https://github.com/rust-lang-nursery/${INTEGRATION}.git
         cd ${INTEGRATION}
-        check
+        check_fmt
         cd -
         ;;
 esac