Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Magically improve coverage #6345

Merged
merged 6 commits into from
Oct 16, 2019
Merged

Magically improve coverage #6345

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cef3e6e
Delete old workaround and magically improve coverage
ryoqun Oct 14, 2019
a82a494
Restore workaround with updated comment; sadly still needed.
ryoqun Oct 16, 2019
550918c
Separate for easier debugging; also forward args
ryoqun Oct 16, 2019
98005bf
Redirect coverage stderr to file
ryoqun Oct 16, 2019
dba30e2
Compress right before uploading to save space
ryoqun Oct 16, 2019
ccafb52
Simplify
ryoqun Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ci/test-coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ scripts/coverage.sh
report=coverage-"${CI_COMMIT:0:9}".tar.gz
mv target/cov/report.tar.gz "$report"
upload-ci-artifact "$report"

stderr_log=target/cov/coverage-stderr.log
compressed_stderr_log="${stderr_log}.gz"
gzip < "$stderr_log" > "$compressed_stderr_log"
upload-ci-artifact "$compressed_stderr_log"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about this instead:

gzip target/cov/coverage-stderr.log
upload-ci-artifact target/cov/coverage-stderr.log.gz

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, It looks nicer; ccafb52.

Just that I'm too fond of redirections and pipes.. :p


annotate --style success --context lcov-report \
"lcov report: <a href=\"artifact://$report\">$report</a>"

Expand Down
7 changes: 5 additions & 2 deletions scripts/coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ reportName="lcov-${CI_COMMIT:0:9}"

if [[ -n $1 ]]; then
crate="--package $1"
shift
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To forward the rest to cargo test at https://github.com/solana-labs/solana/pull/6345/files#diff-c29225768574b8edd4f3608f595c29f7R41, shift $1 here.

else
crate="--all --exclude solana-local-cluster"
fi

coverageFlags=(-Zprofile) # Enable coverage
coverageFlags+=("-Clink-dead-code") # Dead code should appear red in the report
coverageFlags+=("-Ccodegen-units=1") # Disable ThinLTO which corrupts debuginfo (see [rustc issue #45511]).
coverageFlags+=("-Ccodegen-units=1") # Disable code generation parallelism which is unsupported under -Zprofile (see [rustc issue #51705]).
coverageFlags+=("-Cinline-threshold=0") # Disable inlining, which complicates control flow.
coverageFlags+=("-Coverflow-checks=off") # Disable overflow checks, which create unnecessary branches.

Expand All @@ -37,7 +38,9 @@ rm -rf target/cov/$reportName

source ci/rust-version.sh nightly
# shellcheck disable=SC2086 #
_ cargo +$rust_nightly test --target-dir target/cov --lib $crate
RUST_LOG=solana=trace _ cargo +$rust_nightly test --target-dir target/cov --lib --no-run $crate "$@"
# shellcheck disable=SC2086 #
RUST_LOG=solana=trace _ cargo +$rust_nightly test --target-dir target/cov --lib $crate "$@" 2> target/cov/coverage-stderr.log

echo "--- grcov"

Expand Down