From 2cd58e40f0240ffd3a6b526d20c8a7c2fad85fe9 Mon Sep 17 00:00:00 2001 From: mcarton Date: Mon, 3 Oct 2016 17:49:05 +0200 Subject: [PATCH] Improve the coverage script --- util/cov.sh | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/util/cov.sh b/util/cov.sh index 76f4dab71..3f9a6b06f 100755 --- a/util/cov.sh +++ b/util/cov.sh @@ -5,25 +5,15 @@ # `compile-test` is special. `kcov` does not work directly on it so these files # are compiled manually. -tests=( - camel_case - cc_seme - consts - dogfood - issue_825 - matches - trim_multiline - used_underscore_binding_macro - versioncheck -) +tests=$(find tests/ -maxdepth 1 -name '*.rs' ! -name compile-test.rs -exec basename {} .rs \;) tmpdir=$(mktemp -d) cargo test --no-run --verbose -for t in "${tests[@]}"; do +for t in $tests; do kcov \ --verify \ - --include-path="$(pwd)/src","$(pwd)/clippy_lints/src" \ + --include-path="$(pwd)/src,$(pwd)/clippy_lints/src" \ "$tmpdir/$t" \ cargo test --test "$t" done @@ -31,16 +21,16 @@ done for t in ./tests/compile-fail/*.rs; do kcov \ --verify \ - --include-path="$(pwd)/src","$(pwd)/clippy_lints/src" \ - "$tmpdir/compile-fail-$(basename $t)" \ + --include-path="$(pwd)/src,$(pwd)/clippy_lints/src" \ + "$tmpdir/compile-fail-$(basename "$t")" \ cargo run -- -L target/debug -L target/debug/deps -Z no-trans "$t" done for t in ./tests/run-pass/*.rs; do kcov \ --verify \ - --include-path="$(pwd)/src","$(pwd)/clippy_lints/src" \ - "$tmpdir/run-pass-$(basename $t)" \ + --include-path="$(pwd)/src,$(pwd)/clippy_lints/src" \ + "$tmpdir/run-pass-$(basename "$t")" \ cargo run -- -L target/debug -L target/debug/deps -Z no-trans "$t" done