From f9f17b291f044ae260df4ca205177314a63bd091 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 27 Aug 2019 19:33:18 +0100 Subject: [PATCH 1/3] Add code coverage with cargo-tarpaulin and Codecov --- .travis.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.travis.yml b/.travis.yml index 399eaf1..b9fcb7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,12 @@ language: rust rust: - 1.36.0 +addons: + apt: + packages: + # For cargo-tarpaulin + - libssl-dev + cache: cargo before_script: @@ -9,4 +15,16 @@ before_script: script: - cargo fmt --all -- --check + - cargo build --verbose --release --all - cargo test --verbose --release --all + +before_cache: + - rm -rf "$TRAVIS_HOME/.cargo/registry/src" + - cargo install cargo-tarpaulin || echo "cargo-tarpaulin already installed" + - cargo install cargo-update || echo "cargo-update already installed" + - cargo install-update -a # update outdated cached binaries + +after_success: + # Manually exclude packages that are going to be removed from the workspace + - travis_wait cargo tarpaulin --release --timeout 600 --out Xml --packages "librustzcash,zcash_client_backend,zcash_primitives,zcash_proofs" + - bash <(curl -s https://codecov.io/bash) From ee9c88ecb0facbf8f49eff44a05bb9c1cac43aff Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 28 Aug 2019 19:39:35 +0100 Subject: [PATCH 2/3] Exclude slow tests from code coverage --- .github/workflows/rust.yml | 4 ++++ .travis.yml | 1 + zcash_proofs/src/circuit/sprout/mod.rs | 1 + 3 files changed, 6 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index fdeb90d..300a7ba 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,6 +18,8 @@ jobs: run: cargo build --verbose --release --all - name: Run tests run: cargo test --verbose --release --all + - name: Run slow tests + run: cargo test --verbose --release --all -- --ignored macOS: name: Test on macOS-latest @@ -35,3 +37,5 @@ jobs: run: $HOME/.cargo/bin/cargo build --verbose --release --all - name: Run tests run: $HOME/.cargo/bin/cargo test --verbose --release --all + - name: Run slow tests + run: $HOME/.cargo/bin/cargo test --verbose --release --all -- --ignored diff --git a/.travis.yml b/.travis.yml index b9fcb7e..e976cd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ script: - cargo fmt --all -- --check - cargo build --verbose --release --all - cargo test --verbose --release --all + - cargo test --verbose --release --all -- --ignored before_cache: - rm -rf "$TRAVIS_HOME/.cargo/registry/src" diff --git a/zcash_proofs/src/circuit/sprout/mod.rs b/zcash_proofs/src/circuit/sprout/mod.rs index 358e1bb..b946464 100644 --- a/zcash_proofs/src/circuit/sprout/mod.rs +++ b/zcash_proofs/src/circuit/sprout/mod.rs @@ -326,6 +326,7 @@ where } #[test] +#[ignore] fn test_sprout_constraints() { use bellman::gadgets::test::*; use pairing::bls12_381::Bls12; From c00b65bb783372fd16c627b73f7d65fbc82a1481 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 29 Aug 2019 01:06:41 +0100 Subject: [PATCH 3/3] Extend Travis CI timeout --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e976cd0..caa44f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,5 +27,5 @@ before_cache: after_success: # Manually exclude packages that are going to be removed from the workspace - - travis_wait cargo tarpaulin --release --timeout 600 --out Xml --packages "librustzcash,zcash_client_backend,zcash_primitives,zcash_proofs" + - travis_wait 35 cargo tarpaulin --release --timeout 600 --out Xml --packages "librustzcash,zcash_client_backend,zcash_primitives,zcash_proofs" - bash <(curl -s https://codecov.io/bash)