From eeb3efb3f6f6db4b9c69cd8547c0c535b209c065 Mon Sep 17 00:00:00 2001 From: MRain Date: Tue, 25 Jun 2024 11:19:09 -0400 Subject: [PATCH 1/2] fix script --- scripts/test_coverage.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/test_coverage.sh b/scripts/test_coverage.sh index 9b1d41b82..0e9901e0a 100755 --- a/scripts/test_coverage.sh +++ b/scripts/test_coverage.sh @@ -1,5 +1,4 @@ -#!/usr/bin/env nix-shell -#!nix-shell ../nix/nightly.nix -i bash +#!/usr/bin/env bash set -e set -o xtrace IGNORED_FILES="--ignore **/errors.rs\ @@ -11,7 +10,7 @@ export CARGO_INCREMENTAL=0 export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=3 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests" export RUSTDOCFLAGS="" rm -vf ./target/**/*.gcda -cargo build --features "test-srs, gadgets, bls, schnorr" -cargo test --lib --features "test-srs, gadgets, bls, schnorr" +cargo +nightly build --features "test-srs, gadgets, bls, schnorr" +cargo +nightly test --lib --features "test-srs, gadgets, bls, schnorr" grcov . -s . --binary-path ./target/debug/ -t html --branch --ignore-not-existing $IGNORED_FILES -o ./target/debug/coverage/ echo "Coverage report available at target/debug/coverage/index.html." From b4ca0bcdccbb3cd0a48f2c3150edc0e16ca3896b Mon Sep 17 00:00:00 2001 From: MRain Date: Tue, 25 Jun 2024 11:21:45 -0400 Subject: [PATCH 2/2] unstable option back for run_tests.sh --- scripts/run_tests.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index 5217f7212..fe3bf8d9e 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -4,17 +4,17 @@ set -e # We want the code to panic if there is an integer overflow export RUSTFLAGS="-C overflow-checks=on" -cargo test --release -p jf-utils #-- -Zunstable-options --report-time -cargo test --release -p jf-plonk --lib --bins #-- -Zunstable-options --report-time -cargo test --release -p jf-merkle-tree --features gadgets #-- -Zunstable-options --report-time -cargo test --release -p jf-pcs --features test-srs #-- -Zunstable-options --report-time -cargo test --release -p jf-rescue --features gadgets #-- -Zunstable-options --report-time -cargo test --release -p jf-signature --features "bls, schnorr, gadgets" #-- -Zunstable-options --report-time -cargo test --release -p jf-vdf #-- -Zunstable-options --report-time -cargo test --release -p jf-vid --features test-srs #-- -Zunstable-options --report-time -cargo test --release -p jf-aead #-- -Zunstable-options --report-time -cargo test --release -p jf-elgamal --features gadgets #-- -Zunstable-options --report-time -cargo test --release -p jf-vrf #-- -Zunstable-options --report-time -cargo test --release -p jf-prf #-- -Zunstable-options --report-time -cargo test --release -p jf-crhf #-- -Zunstable-options --report-time -cargo test --release -p jf-commitment #-- -Zunstable-options --report-time +cargo +nightly test --release -p jf-utils -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-plonk --lib --bins -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-merkle-tree --features gadgets -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-pcs --features test-srs -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-rescue --features gadgets -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-signature --features "bls, schnorr, gadgets" -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-vdf -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-vid --features test-srs -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-aead -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-elgamal --features gadgets -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-vrf -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-prf -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-crhf -- -Zunstable-options --report-time +cargo +nightly test --release -p jf-commitment -- -Zunstable-options --report-time