Improve coverage.sh's environment awareness (#7101)
* Improve coverage.sh's environment awareness * Move version check into ci/rust-version.sh * Embrace bashism
This commit is contained in:
parent
306fbd8bd8
commit
7f87ac4b65
|
@ -13,8 +13,18 @@
|
||||||
# $ source ci/rust-version.sh
|
# $ source ci/rust-version.sh
|
||||||
#
|
#
|
||||||
|
|
||||||
|
if [[ -n $RUST_STABLE_VERSION ]]; then
|
||||||
|
stable_version="$RUST_STABLE_VERSION"
|
||||||
|
else
|
||||||
stable_version=1.39.0
|
stable_version=1.39.0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n $RUST_NIGHTLY_VERSION ]]; then
|
||||||
|
nightly_version="$RUST_NIGHTLY_VERSION"
|
||||||
|
else
|
||||||
nightly_version=2019-11-13
|
nightly_version=2019-11-13
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
export rust_stable="$stable_version"
|
export rust_stable="$stable_version"
|
||||||
export rust_stable_docker_image=solanalabs/rust:"$stable_version"
|
export rust_stable_docker_image=solanalabs/rust:"$stable_version"
|
||||||
|
|
|
@ -24,7 +24,7 @@ coverageFlags+=("-Ccodegen-units=1") # Disable code generation parallelism w
|
||||||
coverageFlags+=("-Cinline-threshold=0") # Disable inlining, which complicates control flow.
|
coverageFlags+=("-Cinline-threshold=0") # Disable inlining, which complicates control flow.
|
||||||
coverageFlags+=("-Coverflow-checks=off") # Disable overflow checks, which create unnecessary branches.
|
coverageFlags+=("-Coverflow-checks=off") # Disable overflow checks, which create unnecessary branches.
|
||||||
|
|
||||||
export RUSTFLAGS="${coverageFlags[*]}"
|
export RUSTFLAGS="${coverageFlags[*]} $RUSTFLAGS"
|
||||||
export CARGO_INCREMENTAL=0
|
export CARGO_INCREMENTAL=0
|
||||||
export RUST_BACKTRACE=1
|
export RUST_BACKTRACE=1
|
||||||
export RUST_MIN_STACK=8388608
|
export RUST_MIN_STACK=8388608
|
||||||
|
|
Loading…
Reference in New Issue