diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | maint/coverage | 2 | ||||
| -rwxr-xr-x | maint/with_coverage | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c57a210ee..02d9d0be0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,7 +123,7 @@ coverage: script: - apt-get update && apt-get install -y python3-pip python3-setuptools - pip3 install beautifulsoup4 lxml - - rustup component add llvm-tools-preview + - rustup component add llvm-tools - ./maint/via-cargo-install-in-ci grcov # Generate report - ./maint/with_coverage -f cobertura -o coverage.xml cargo test --verbose --all-features @@ -308,7 +308,7 @@ coverage-aggregated: - apt update && apt install -y tor python3 python3-pip python3-setuptools curl # install deps for report generation - pip3 install beautifulsoup4 lxml - - rustup component add llvm-tools-preview + - rustup component add llvm-tools - cp grcov $CARGO_HOME/bin/ || cargo install grcov - cp $CARGO_HOME/bin/grcov . # Generate report diff --git a/maint/coverage b/maint/coverage index d96423143..88a9ea633 100755 --- a/maint/coverage +++ b/maint/coverage @@ -17,7 +17,7 @@ Suites: "all": enables all suites. Notes: - You need to have grcov and llvm-tools-preview installed. + You need to have grcov and llvm-tools installed. For integration tests, you'll need chutney and tor. EOF } diff --git a/maint/with_coverage b/maint/with_coverage index 3d6ecb809..19d208eb0 100755 --- a/maint/with_coverage +++ b/maint/with_coverage @@ -23,7 +23,7 @@ Options: -o <path>: set the output path for the coverage report (default "coverage") Notes: - You need to have grcov and llvm-tools-preview installed. + You need to have grcov and llvm-tools installed. EOF } @@ -77,9 +77,9 @@ if [ "$(command -v grcov 2>/dev/null)" = "" ]; then exit 1 fi -# Validate that llvm-tools-preview is installed. -if [ "$(rustup "+${RUST_COVERAGE_TOOLCHAIN}" component list --installed | grep llvm-tools-preview)" = "" ]; then - echo "llvm-tools-preview appears not to be installed. Try 'rustup +${RUST_COVERAGE_TOOLCHAIN} component add llvm-tools-preview'." >&2 +# Validate that llvm-tools is installed. +if [ "$(rustup "+${RUST_COVERAGE_TOOLCHAIN}" component list --installed | grep llvm-tools)" = "" ]; then + echo "llvm-tools appears not to be installed. Try 'rustup +${RUST_COVERAGE_TOOLCHAIN} component add llvm-tools'." >&2 exit 1 fi |