Skip to content

Fix (some) shellcheck lint errors #6598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −28
Open

Fix (some) shellcheck lint errors #6598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions ci/integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -ex

: ${INTEGRATION?"The INTEGRATION environment variable must be set."}
: "${INTEGRATION?'The INTEGRATION environment variable must be set.'}"

# FIXME: this means we can get a stale cargo-fmt from a previous run.
#
Expand Down Expand Up @@ -42,8 +42,12 @@ function check_fmt_with_lib_tests {

function check_fmt_base {
local test_args="$1"
local build=$(cargo test $test_args 2>&1)
if [[ "$build" =~ "build failed" ]] || [[ "$build" =~ "test result: FAILED." ]]; then
local build
# shellcheck is complaining that `$test_args` can be interpreted as multiple arguments
# in case it contains whitespace characters... which is exactly what we want.
# shellcheck disable=SC2086
build=$(cargo test $test_args 2>&1)
if [[ "$build" =~ "build failed" ]] || [[ "$build" =~ test\ result\:\ FAILED\. ]]; then
return 0
fi
touch rustfmt.toml
Expand All @@ -53,67 +57,64 @@ function check_fmt_base {
return 1
fi
cat rustfmt_output
! cat rustfmt_output | grep -q "internal error"
if [[ $? != 0 ]]; then
return 1
fi
! cat rustfmt_output | grep -q "warning"
if [[ $? != 0 ]]; then
return 1
fi
! cat rustfmt_output | grep -q "Warning"
if [[ $? != 0 ]]; then
return 1
fi
grep -q "internal error" < rustfmt_output && return 1
grep -q "warning" < rustfmt_output && return 1
grep -q "Warning" < rustfmt_output && return 1

cargo fmt --all -- --check |& tee rustfmt_check_output
if [[ ${PIPESTATUS[0]} != 0 ]]; then
cat rustfmt_check_output
return 1
fi
# shellcheck is complaining that `$test_args` can be interpreted as multiple arguments
# in case it contains whitespace characters... which is exactly what we want.
# shellcheck disable=SC2086
cargo test $test_args
if [[ $? != 0 ]]; then
return $?
cargo_ret=$?
if [[ $cargo_ret != 0 ]]; then
return $cargo_ret
fi
}

function show_head {
local head=$(git rev-parse HEAD)
local head
head=$(git rev-parse HEAD)
echo "Head commit of ${INTEGRATION}: $head"
}

case ${INTEGRATION} in
cargo)
git clone --depth=1 https://github.com/rust-lang/${INTEGRATION}.git
cd ${INTEGRATION}
git clone --depth=1 "https://github.com/rust-lang/${INTEGRATION}.git"
cd "${INTEGRATION}"
show_head
export CFG_DISABLE_CROSS_TESTS=1
check_fmt_with_all_tests
cd -
;;
crater)
git clone --depth=1 https://github.com/rust-lang/${INTEGRATION}.git
cd ${INTEGRATION}
git clone --depth=1 "https://github.com/rust-lang/${INTEGRATION}.git"
cd "${INTEGRATION}"
show_head
check_fmt_with_lib_tests
cd -
;;
bitflags)
git clone --depth=1 https://github.com/bitflags/${INTEGRATION}.git
cd ${INTEGRATION}
git clone --depth=1 "https://github.com/bitflags/${INTEGRATION}.git"
cd "${INTEGRATION}"
show_head
check_fmt_with_all_tests
cd -
;;
tempdir)
git clone --depth=1 https://github.com/rust-lang-deprecated/${INTEGRATION}.git
cd ${INTEGRATION}
git clone --depth=1 "https://github.com/rust-lang-deprecated/${INTEGRATION}.git"
cd "${INTEGRATION}"
show_head
check_fmt_with_all_tests
cd -
;;
*)
git clone --depth=1 https://github.com/rust-lang/${INTEGRATION}.git
cd ${INTEGRATION}
git clone --depth=1 "https://github.com/rust-lang/${INTEGRATION}.git"
cd "${INTEGRATION}"
show_head
check_fmt_with_all_tests
cd -
Expand Down
Loading