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

Migrate a few test files to snapbox #14048

Merged
merged 5 commits into from
Jun 13, 2024
Merged

Migrate a few test files to snapbox #14048

merged 5 commits into from
Jun 13, 2024

Conversation

Muscraft
Copy link
Member

@Muscraft Muscraft commented Jun 11, 2024 •
edited by epage
Loading

This migrates the following files to snapbox

  • artifact_dep
    • Has a few does_not_contain
  • artifact_dir
  • bad_config
  • bad_manifest_path
    • Does not use str! for all tests
  • bench

Note: This also adds auto-redactions for:

  • [HOST_TARGET]
  • [ALT_TARGET]
    • Only added if cross-compilation is allowed for the target
  • [AVG_ELAPSED]
    • For bench output
  • [JITTER]
    • For bench output

Part of #14039

@rustbot
Copy link
Collaborator

rustbot commented Jun 11, 2024

r? @epage

rustbot has assigned @epage.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-testing-cargo-itself Area: cargo's tests S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 11, 2024
@Muscraft Muscraft mentioned this pull request Jun 11, 2024
Closed
@Muscraft Muscraft force-pushed the move-to-snapbox branch 8 times, most recently from 79f7c12 to 841e9ac Compare June 12, 2024 16:42
epage
epage reviewed Jun 12, 2024
View reviewed changes
tests/testsuite/artifact_dep.rs Outdated
Comment on lines 1266 to 1223
.with_stderr_does_not_contain(format!(
"[RUNNING] `rustc --crate-name foo [..]--target {} [..]",
target
))
.with_stderr_contains("[RUNNING] `rustc --crate-name foo [..]")
Copy link
Contributor

Choose a reason for hiding this comment

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

I feel like these are easier to contrast with the previous way

@Muscraft Muscraft mentioned this pull request Jun 12, 2024
Merged
bors added a commit that referenced this pull request Jun 12, 2024
@bors
Auto merge of #14054 - Muscraft:add-assert-redactions, r=epage
00ea165 
Add assert redactions

This was split out from #14048 so that the test changes in that PR do not block the redactions.

This adds auto-redactions for:
- A new `[HASH]` for `/<file>-<16 char hash>`
- `[HOST_TARGET]`
- `[ALT_TARGET]`
  - Only added if cross-compilation is allowed for the target
- `[AVG_ELAPSED]`
  - For `bench` output
- `[JITTER]`
  - For `bench` output

This also moves all common redactions to a function that `assert_e2e` and `assert_ui` call to reduce the amount of duplicate code and makes it so we only compile regex redactions once.
@Muscraft Muscraft force-pushed the move-to-snapbox branch 3 times, most recently from b7068d5 to 9a41d70 Compare June 12, 2024 22:55
@epage
Copy link
Contributor

epage commented Jun 13, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Jun 13, 2024

📌 Commit d0804f8 has been approved by epage

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 13, 2024
@bors
Copy link
Contributor

bors commented Jun 13, 2024

⌛ Testing commit d0804f8 with merge 0d7c7b8...

@bors
Copy link
Contributor

bors commented Jun 13, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing 0d7c7b8 to master...

@bors bors merged commit 0d7c7b8 into rust-lang:master Jun 13, 2024
22 checks passed
@Muscraft Muscraft deleted the move-to-snapbox branch June 13, 2024 20:34
@weihanglo weihanglo mentioned this pull request Jun 15, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 15, 2024
@bors
Auto merge of rust-lang#126507 - weihanglo:update-cargo, r=weihanglo
9239d3e 
Update cargo

13 commits in 4dcbca118ab7f9ffac4728004c983754bc6a04ff..a1f47ec3f7cd076986f1bfcd7061f2e8cb1a726e
2024-06-11 16:27:02 +0000 to 2024-06-15 01:10:07 +0000
- Change verification order during packaging. (rust-lang/cargo#14074)
- Update git2 for libgit2 1.8.1 (rust-lang/cargo#14067)
- Fix some documentation misspellings (rust-lang/cargo#14066)
- chore(deps): update msrv (1 version) to v1.79 (rust-lang/cargo#14063)
- test: Redact conditional compile-fail warning (rust-lang/cargo#14064)
- Migrate a few test files to snapbox (rust-lang/cargo#14048)
- docs(contrib): Improve triage instructions (rust-lang/cargo#14052)
- chore(ci): Upgrade cargo-semver-checks (rust-lang/cargo#14062)
- Revert rust-lang/cargo#13630 as rustc ignores `-C strip` on MSVC (rust-lang/cargo#14061)
- test: migrate features_are_quoted to snapbox (rust-lang/cargo#14051)
- Add assert redactions (rust-lang/cargo#14054)
- test: migrate build_script_env to snapbox (rust-lang/cargo#14044)
- docs: Iterate on --breaking docs (rust-lang/cargo#14047)

r? ghost
@rustbot rustbot added this to the 1.81.0 milestone Jun 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weihanglo weihanglo weihanglo left review comments

@epage epage epage left review comments

Assignees

@epage epage

Labels
A-testing-cargo-itself Area: cargo's tests S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Muscraft @rustbot @epage @bors @weihanglo