diff --git a/.github/workflows/cargo_llvm_cov.yml b/.github/workflows/cargo_llvm_cov.yml index 1508a286f4a..a140f2c64e0 100644 --- a/.github/workflows/cargo_llvm_cov.yml +++ b/.github/workflows/cargo_llvm_cov.yml @@ -57,7 +57,7 @@ jobs: - name: Generate code coverage report (nextest.info) run: | cargo llvm-cov clean - LLVM_PROFDATA="$HOME/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata" + LLVM_PROFDATA="$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata" if [[ -x "$LLVM_PROFDATA" ]]; then $LLVM_PROFDATA --version else @@ -65,7 +65,7 @@ jobs: exit 1 fi set +e - IOTA_SKIP_SIMTESTS=1 cargo llvm-cov --ignore-run-fail --no-report nextest -vv + IOTA_SKIP_SIMTESTS=1 cargo +nightly llvm-cov --ignore-run-fail --no-report nextest -vv find target/llvm-cov-target -name '*.profraw' | while read file; do if ! $LLVM_PROFDATA show "$file" > /dev/null 2>&1; then echo "Removing corrupted file: $file" diff --git a/scripts/simtest/simtest-cov.sh b/scripts/simtest/simtest-cov.sh index 477270cfa16..9f2f86788a5 100755 --- a/scripts/simtest/simtest-cov.sh +++ b/scripts/simtest/simtest-cov.sh @@ -19,7 +19,7 @@ export SIMTEST_STATIC_INIT_MOVE=$root_dir"/examples/move/basics" # MSIM_WATCHDOG_TIMEOUT_MS=60000 MSIM_TEST_SEED=1 cargo +nightly llvm-cov --ignore-run-fail --branch --lcov --output-path simtest.info \ # nextest -vv --cargo-profile simulator -MSIM_WATCHDOG_TIMEOUT_MS=60000 MSIM_TEST_SEED=1 cargo llvm-cov --ignore-run-fail --no-report nextest -vv --cargo-profile simulator +MSIM_WATCHDOG_TIMEOUT_MS=60000 MSIM_TEST_SEED=1 cargo +nightly llvm-cov --ignore-run-fail --no-report nextest -vv --cargo-profile simulator find target/llvm-cov-target -name '*.profraw' | while read file; do if ! "$HOME/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata" show "$file" > /dev/null 2>&1; then @@ -28,7 +28,7 @@ find target/llvm-cov-target -name '*.profraw' | while read file; do fi done -cargo llvm-cov report --lcov --output-path target/llvm-cov/simtest.info +cargo +nightly llvm-cov report --lcov --output-path target/llvm-cov/simtest.info # remove the patch git checkout .cargo/config Cargo.toml Cargo.lock