Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit ddf0b70

Browse files
committed
ci: include all targets in coverage
And do it in a way that doesn't fill your disk when iterating.
1 parent a3e7499 commit ddf0b70

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

.github/workflows/rust-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ jobs:
165165
coverage:
166166
name: Generate and upload coverage report
167167
runs-on: ubuntu-latest
168+
env:
169+
TEST_COLLECT_COVERAGE: 1
168170
steps:
169171
- name: Checkout
170172
uses: actions/checkout@v3

Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,20 +195,25 @@ clean:
195195
clippy: compile-cairo compile-starknet compile-cairo-1-casm compile-cairo-1-sierra compile-cairo-2-casm compile-cairo-2-sierra
196196
cargo clippy --workspace --all-targets --all-features -- -D warnings
197197

198+
TEST_COMMAND:=cargo nextest run --release
199+
ifdef TEST_COLLECT_COVERAGE
200+
TEST_COMMAND:=cargo +nightly llvm-cov nextest --release --ignore-filename-regex 'main.rs' --no-report
201+
endif
202+
198203
test: compile-cairo compile-starknet compile-cairo-1-casm compile-cairo-1-sierra compile-cairo-2-casm compile-cairo-2-sierra
199204
echo "Cairo1 tests"
200205
$(MAKE) test-cairo-1
201206
echo "Cairo2 tests"
202207
$(MAKE) test-cairo-2
203208

204209
test-cairo-1: compile-cairo compile-starknet compile-cairo-1-casm compile-cairo-1-sierra compile-cairo-2-casm compile-cairo-2-sierra
205-
cargo nextest run --workspace --all-targets --features=cairo_1_tests,metrics,cairo-native
210+
$(TEST_COMMAND) --workspace --all-targets --features=cairo_1_tests,metrics,cairo-native
206211

207212
test-cairo-2: compile-cairo compile-starknet compile-cairo-1-casm compile-cairo-1-sierra compile-cairo-2-casm compile-cairo-2-sierra
208-
cargo nextest run --workspace --all-targets --features=metrics,cairo-native
213+
$(TEST_COMMAND) --workspace --all-targets --features=metrics,cairo-native
209214

210215
test-cairo-native: compile-cairo compile-starknet compile-cairo-1-casm compile-cairo-1-sierra compile-cairo-2-casm compile-cairo-2-sierra
211-
cargo nextest run --workspace --test cairo_native --features=cairo-native
216+
$(TEST_COMMAND) --workspace --test cairo_native --features=cairo-native
212217

213218
test-doctests:
214219
cargo test --workspace --doc
@@ -217,7 +222,7 @@ coverage: compile-cairo compile-starknet compile-cairo-1-casm compile-cairo-2-ca
217222
$(MAKE) coverage-report
218223

219224
coverage-report: compile-cairo compile-starknet compile-cairo-1-casm compile-cairo-1-sierra compile-cairo-2-casm compile-cairo-2-sierra
220-
cargo +nightly llvm-cov nextest --lcov --ignore-filename-regex 'main.rs' --output-path lcov.info --release
225+
cargo +nightly llvm-cov report --lcov --output-path lcov.info
221226

222227
heaptrack:
223228
./scripts/heaptrack.sh

0 commit comments

Comments
 (0)