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.

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

Add test tracing, fix up comments #544

Merged
merged 1 commit into from
Aug 5, 2024
Merged

Conversation

carljm
Copy link
Contributor

@carljm carljm commented Jul 30, 2024

This PR does two things:

  1. Add the trace feature for the test-log dependency, which I've found very useful in trying to understand the cycle-handling code. It means that I can change #[test] to #[test_log::test] above a failing test of interest, and then if I run cargo test with e.g. RUST_LOG=debug, the failing test output will include all the debug traces from that test.

  2. Fix up a bunch of comments and some debug traces I ran across in my exploration that looked out of date.

Happy to split this into two PRs if that's preferred.

Copy link

netlify bot commented Jul 30, 2024

Deploy Preview for salsa-rs canceled.

Name Link
🔨 Latest commit 56e29b5
🔍 Latest deploy log https://app.netlify.com/sites/salsa-rs/deploys/66b0f1462f162d0008e46af6

Copy link

codspeed-hq bot commented Jul 30, 2024

CodSpeed Performance Report

Merging #544 will not alter performance

Comparing carljm:test-log (56e29b5) with master (994c988)

Summary

✅ 1 untouched benchmarks

@carljm carljm marked this pull request as ready for review July 30, 2024 02:15
src/function.rs Show resolved Hide resolved
tests/cycles.rs Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

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

You probably want to revert this change, considering that it is part of your other PR

Copy link
Contributor Author

@carljm carljm Jul 30, 2024

Choose a reason for hiding this comment

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

I rebased this PR on that one to get the tests passing here, then noticed that since I pushed the branch to my own fork I couldn't actually set the PR base branch to the other PRs branch, so the commit from the other branch is included here. Once the other PR is merged I can rebase this one. (Or I can rebase it sooner and just let the tests fail.)

@nikomatsakis
Copy link
Member

@carljm looks good to me but needs to be rebased. feel free to merge.

@carljm
Copy link
Contributor Author

carljm commented Aug 5, 2024

@nikomatsakis Rebased, but I can't merge; it says "Merging is blocked: The base branch restricts merging to authorized users."

@carljm carljm added this pull request to the merge queue Aug 5, 2024
Merged via the queue into salsa-rs:master with commit 2979ef5 Aug 5, 2024
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants