Commit 0fb37281 authored by Nick Mathewson's avatar Nick Mathewson 🦞
Browse files

Merge branch 'stable-coverage' into 'main' 

use rustc 1.60 for coverage

See merge request !451
parents d81de158 7c4ad15f

.gitlab-ci.yml

+0 −3
Original line number Original line Diff line number Diff line
@@ -78,12 +78,9 @@ rust-nightly: 
coverage:

coverage:

  stage: test

  stage: test

  image: rust:latest

  image: rust:latest

  allow_failure: true

  script:

  script:

    - apt-get update && apt-get install -y python3-pip python3-setuptools

    - apt-get update && apt-get install -y python3-pip python3-setuptools

    - pip3 install beautifulsoup4 lxml

    - pip3 install beautifulsoup4 lxml

    - rustup toolchain add nightly

    - rustup default nightly

    - rustup component add llvm-tools-preview

    - rustup component add llvm-tools-preview

    - cp grcov $CARGO_HOME/bin/ || cargo install grcov

    - cp grcov $CARGO_HOME/bin/ || cargo install grcov

    - cp $CARGO_HOME/bin/grcov .

    - cp $CARGO_HOME/bin/grcov .

maint/coverage

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ Suites: 
  "all": enables all suites.

  "all": enables all suites.





Notes:

Notes:

  You need to have grcov, rust-nightly, and llvm-tools-preview installed.

  You need to have grcov and llvm-tools-preview installed.

  For integration tests, you'll need chutney and tor.

  For integration tests, you'll need chutney and tor.

EOF

EOF

}

}

maint/with_coverage

+4 −4
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ Options: 
  -o <path>: set the output path for the coverage report (defaiult "coverage")

  -o <path>: set the output path for the coverage report (defaiult "coverage")





Notes:

Notes:

  You need to have grcov, rust-nightly, and llvm-tools-preview installed.

  You need to have grcov and llvm-tools-preview installed.

EOF

EOF

}

}
@@ -64,8 +64,8 @@ if [ $# -eq 0 ] && [ $interactive = "no" ]; then 
    echo "Run ${SCRIPT_NAME} -h for help."

    echo "Run ${SCRIPT_NAME} -h for help."

    exit 1

    exit 1

fi

fi



default_toolchain=$(rustup show active-toolchain | cut -d' ' -f1)

echo "Using toolchain +${RUST_COVERAGE_TOOLCHAIN:=nightly}. (Override with \$RUST_COVERAGE_TOOLCHAIN)"

echo "Using toolchain +${RUST_COVERAGE_TOOLCHAIN:=${default_toolchain}}. (Override with \$RUST_COVERAGE_TOOLCHAIN)"





# Validate that "+${RUST_COVERAGE_TOOLCHAIN}" is installed.  This will log a message to stderr

# Validate that "+${RUST_COVERAGE_TOOLCHAIN}" is installed.  This will log a message to stderr

# if it isn't.

# if it isn't.
@@ -84,7 +84,7 @@ if [ "$(rustup "+${RUST_COVERAGE_TOOLCHAIN}" component list --installed | grep l 
fi

fi





COVERAGE_BASEDIR=$(git rev-parse --show-toplevel)

COVERAGE_BASEDIR=$(git rev-parse --show-toplevel)

export RUSTFLAGS="-Z instrument-coverage"

export RUSTFLAGS="-C instrument-coverage"

export LLVM_PROFILE_FILE=$COVERAGE_BASEDIR/coverage_meta/%p-%m.profraw

export LLVM_PROFILE_FILE=$COVERAGE_BASEDIR/coverage_meta/%p-%m.profraw

export RUSTUP_TOOLCHAIN="${RUST_COVERAGE_TOOLCHAIN}"

export RUSTUP_TOOLCHAIN="${RUST_COVERAGE_TOOLCHAIN}"