mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

preserve pipe error status (tee always succeeds); check fmt before running tests

Browse Source
This commit is contained in:
gnzlbg 2018-06-15 15:07:32 +02:00
parent aacebc854a
commit 88a2c48ce3
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ci/integration.sh
View File

@ -23,12 +23,12 @@ cargo fmt -- --version
# Checks that:
#
# * `cargo fmt --all` succeeds without any warnings or errors
# * `cargo test -all` still passes (formatting did not break the build)
# * `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
if [[ $? != 0 ]]; then
if [[ ${PIPESTATUS[0]} != 0 ]]; then
cat rustfmt_output
return 1
fi
@ -45,16 +45,15 @@ function check_fmt {
if [[ $? != 0 ]]; then
return 1
fi
cargo fmt --all -- --check 2>&1 | tee rustfmt_check_output
if [[ ${PIPESTATUS[0]} != 0 ]]; then
cat rustfmt_check_output
return 1
fi
cargo test --all
if [[ $? != 0 ]]; then
return $?
fi
cargo fmt --all -- --check 2>&1 | tee rustfmt_check_output
if [[ $? != 0 ]]; then
cat rustfmt_check_output
return 1
fi
}
case ${INTEGRATION} in