test: migrate cfg and check to snapbox#14185

eth3lbert · 2024-07-03T21:50:12Z

What does this PR try to resolve?

Part of #14039.

Migrate following to snapbox:

tests/testsuite/cfg.rs
tests/testsuite/check.rs

rustbot · 2024-07-03T21:50:16Z

rustbot has assigned @ehuss.
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

eth3lbert · 2024-07-04T04:26:55Z

tests/testsuite/check.rs

        .run();
 }

+#[allow(deprecated)]


with_stderr_does_not_contain is being used in this function.

eth3lbert · 2024-07-04T04:32:02Z

tests/testsuite/check.rs

+        .with_stderr_data(
+            format!(
+                "\
 [WARNING] unused manifest key: dependencies.dep.wxz
 [WARNING] unused manifest key: dependencies.foo.abc
 [WARNING] unused manifest key: dev-dependencies.foo.wxz
 [WARNING] unused manifest key: build-dependencies.foo.wxz
 [WARNING] unused manifest key: target.bar.build-dependencies.foo.wxz
 [WARNING] unused manifest key: target.cfg(windows).dependencies.foo.wxz
-[WARNING] unused manifest key: target.x86_64-pc-windows-gnu.dev-dependencies.foo.wxz
-[UPDATING] `[..]` index
+[WARNING] unused manifest key: target.{}.dev-dependencies.foo.wxz
+[UPDATING] `dummy-registry` index
 [LOCKING] 3 packages to latest compatible versions
 [DOWNLOADING] crates ...
-[DOWNLOADED] foo v0.1.0 ([..])
-[DOWNLOADED] dep v0.1.0 ([..])
-[CHECKING] [..]
-[CHECKING] [..]
-[CHECKING] bar v0.2.0 ([CWD])
-[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
+[DOWNLOADED] foo v0.1.0 (registry `dummy-registry`)
+[DOWNLOADED] dep v0.1.0 (registry `dummy-registry`)
+[CHECKING] foo v0.1.0
+[CHECKING] dep v0.1.0
+[CHECKING] bar v0.2.0 ([ROOT]/foo)
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 ",
+                if cfg!(all(target_os = "windows", target_env = "gnu")) {
+                    "[HOST_TARGET]"
+                } else {
+                    "x86_64-pc-windows-gnu"
+                }
+            )
+            .unordered(),


x86_64-pc-windows-gnu is being modified to [HOST_TARGET] on windows with gnu. 😅

FYI: https://github.com/rust-lang/cargo/actions/runs/9786239334/job/27020737537#step:11:4049

--- Expected ++++ actual: stderr 1 1 | [WARNING] unused manifest key: dependencies.dep.wxz 2 2 | [WARNING] unused manifest key: dependencies.foo.abc 3 3 | [WARNING] unused manifest key: dev-dependencies.foo.wxz 4 4 | [WARNING] unused manifest key: build-dependencies.foo.wxz 5 5 | [WARNING] unused manifest key: target.bar.build-dependencies.foo.wxz 6 6 | [WARNING] unused manifest key: target.cfg(windows).dependencies.foo.wxz 7 - [WARNING] unused manifest key: target.x86_64-pc-windows-gnu.dev-dependencies.foo.wxz 8 7 | [UPDATING] `dummy-registry` index 9 8 | [LOCKING] 3 packages to latest compatible versions 10 9 | [DOWNLOADING] crates ... 11 10 | [DOWNLOADED] foo v0.1.0 (registry `dummy-registry`) 12 11 | [DOWNLOADED] dep v0.1.0 (registry `dummy-registry`) 13 12 | [CHECKING] foo v0.1.0 14 13 | [CHECKING] dep v0.1.0 15 14 | [CHECKING] bar v0.2.0 ([ROOT]/foo) 16 15 | [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s 16 + [WARNING] unused manifest key: target.[HOST_TARGET].dev-dependencies.foo.wxz

Maybe we can just change to something like wasm32-wasip1 that would never conflict?

Great idea!

eth3lbert · 2024-07-04T04:35:40Z

tests/testsuite/check.rs

+        .with_stderr_data(str![[r#"
+[CHECKING] foo v0.0.1 ([ROOT]/foo)
+[ERROR] traits in `#[derive(...)]` don't accept arguments
+ --> src/lib.rs:2:15
+  |
+2 | #[derive(Debug(x))]
+  |               ^^^ [HELP] remove the arguments
+
+[WARNING] unused import: `std::io`
+ --> src/lib.rs:1:5
+  |
+1 | use std::io;
+  |     ^^^^^^^
+  |
+  = [NOTE] `#[warn(unused_imports)]` on by default
+
+[WARNING] `foo` (lib) generated 1 warning
+[ERROR] could not compile `foo` (lib) due to 1 previous error; 1 warning emitted
+
+"#]])


Note: This change removes tests with messages originating from raw_rustc_output and directly compares them with snapshots. Please let me know if this approach is inappropriate.

I feel like eventually raw_rustc_output can be removed. We should probably omit rustc diagnostics and only asset error code part.

weihanglo · 2024-07-04T21:07:36Z

tests/testsuite/cfg.rs

+___[EXE]
+lib___.rlib


Any reason we start checking these?

No, since it's a snapshot, I'm trying to minimize the use of glob redactions.

weihanglo · 2024-07-04T21:13:19Z

tests/testsuite/check.rs

+[LOCKING] 2 packages to latest compatible versions
+[CHECKING] bar v0.1.0 ([ROOT]/bar)
+[CHECKING] foo v0.0.1 ([ROOT]/foo)
+error[E0425]: cannot find function `qux` in crate `bar`


If I remember correctly, this changed recently because rustc diagnostic message has changed. I would suggest omitting the actual message instead.

(Got an impression that in one PR I suggested redacting the message and only comparing error codes but it haven't yet done.)

Are you suggesting that we simply check for errors like error[E0425]: [..]?

yes, unless you also want to add a redaction of the main error message

weihanglo · 2024-07-04T22:01:36Z

tests/testsuite/check.rs

+        .with_stderr_data(
+            format!(
+                "\
 [WARNING] unused manifest key: dependencies.dep.wxz
 [WARNING] unused manifest key: dependencies.foo.abc
 [WARNING] unused manifest key: dev-dependencies.foo.wxz
 [WARNING] unused manifest key: build-dependencies.foo.wxz
 [WARNING] unused manifest key: target.bar.build-dependencies.foo.wxz
 [WARNING] unused manifest key: target.cfg(windows).dependencies.foo.wxz
-[WARNING] unused manifest key: target.x86_64-pc-windows-gnu.dev-dependencies.foo.wxz
-[UPDATING] `[..]` index
+[WARNING] unused manifest key: target.{}.dev-dependencies.foo.wxz
+[UPDATING] `dummy-registry` index
 [LOCKING] 3 packages to latest compatible versions
 [DOWNLOADING] crates ...
-[DOWNLOADED] foo v0.1.0 ([..])
-[DOWNLOADED] dep v0.1.0 ([..])
-[CHECKING] [..]
-[CHECKING] [..]
-[CHECKING] bar v0.2.0 ([CWD])
-[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
+[DOWNLOADED] foo v0.1.0 (registry `dummy-registry`)
+[DOWNLOADED] dep v0.1.0 (registry `dummy-registry`)
+[CHECKING] foo v0.1.0
+[CHECKING] dep v0.1.0
+[CHECKING] bar v0.2.0 ([ROOT]/foo)
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 ",
+                if cfg!(all(target_os = "windows", target_env = "gnu")) {
+                    "[HOST_TARGET]"
+                } else {
+                    "x86_64-pc-windows-gnu"
+                }
+            )
+            .unordered(),


Maybe we can just change to something like wasm32-wasip1 that would never conflict?

weihanglo · 2024-07-04T22:24:47Z

tests/testsuite/check.rs

+        .with_stderr_data(str![[r#"
+[CHECKING] foo v0.0.1 ([ROOT]/foo)
+[ERROR] traits in `#[derive(...)]` don't accept arguments
+ --> src/lib.rs:2:15
+  |
+2 | #[derive(Debug(x))]
+  |               ^^^ [HELP] remove the arguments
+
+[WARNING] unused import: `std::io`
+ --> src/lib.rs:1:5
+  |
+1 | use std::io;
+  |     ^^^^^^^
+  |
+  = [NOTE] `#[warn(unused_imports)]` on by default
+
+[WARNING] `foo` (lib) generated 1 warning
+[ERROR] could not compile `foo` (lib) due to 1 previous error; 1 warning emitted
+
+"#]])


I feel like eventually raw_rustc_output can be removed. We should probably omit rustc diagnostics and only asset error code part.

eth3lbert · 2024-07-04T22:58:43Z

All feedback addressed! Thanks :)

weihanglo · 2024-07-05T00:24:51Z

Thank you.

@bors r+

bors · 2024-07-05T00:24:53Z

📌 Commit 2706247 has been approved by weihanglo

It is now in the queue for this repository.

bors · 2024-07-05T00:26:00Z

⌛ Testing commit 2706247 with merge 236f58a...

bors · 2024-07-05T00:54:19Z

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 236f58a to master...

This is partial revert of #rust-lang#14185 (fd8a91d) People are unlikely to see these comments when updating snapshots. Although the changes made in that commit are valid, for the same reason mentioned in the comment rust-lang#14181 (comment), "People are unlikely to see these comments when updating snapshots". Therefore, it would be better to revert these parts.

This is partial revert of rust-lang#14185 (2706247) People are unlikely to see these comments when updating snapshots. Although the changes made in that commit are valid, for the same reason mentioned in the comment rust-lang#14181 (comment), "People are unlikely to see these comments when updating snapshots". Therefore, it would be better to revert these parts.

This is partial revert of rust-lang#14185 (2706247) Although the changes made in that commit are valid, for the same reason mentioned in the comment rust-lang#14181 (comment), "People are unlikely to see these comments when updating snapshots". Therefore, it would be better to revert these parts.

…r=weihanglo fix(test): Restore `does_not_contain` for check This is partial revert of #14185 (2706247) Although the changes made in that commit are valid, for the same reason mentioned in the comment #14181 (comment), "People are unlikely to see these comments when updating snapshots". Therefore, it would be better to revert these parts. --- Let me know if anything's missing!

Update cargo 13 commits in a515d463427b3912ec0365d106791f88c1c14e1b..f86ce56396168edf5d0e1c412ddda0b2edba7d46 2024-07-02 20:53:36 +0000 to 2024-07-05 17:52:05 +0000 - test: Migrate jobserver to snapbox (rust-lang/cargo#14191) - chore(deps): update msrv (3 versions) to v1.77 (rust-lang/cargo#14186) - test: migrate build_plan and build_script to snapbox (rust-lang/cargo#14193) - test: migrate cfg and check to snapbox (rust-lang/cargo#14185) - test: migrate install* and inheritable_workspace_fields to snapbox (rust-lang/cargo#14170) - Pass rustflags to artifacts built with implicit targets when using target-applies-to-host (rust-lang/cargo#13900) - test: Migrate network tests to snapbox (rust-lang/cargo#14187) - test: migrate some files to snapbox (rust-lang/cargo#14113) - test: Auto-redact `... after last build at ...`; Migrate `freshness` to Snapbox (rust-lang/cargo#14161) - chore: fix some typos (rust-lang/cargo#14182) - fix: improve message for inactive weak optional feature with edition2024 through unused dep collection (rust-lang/cargo#14026) - test：migrate `doc/directory/docscrape` to snapbox (rust-lang/cargo#14171) - test: Migrate git_auth to snapbox (rust-lang/cargo#14172)

Update cargo 20 commits in a515d463427b3912ec0365d106791f88c1c14e1b..154fdac39ae9629954e19e9986fd2cf2cdd8d964 2024-07-02 20:53:36 +0000 to 2024-07-07 01:28:23 +0000 - test: relax redactions for rust-lang/rust (rust-lang/cargo#14203) - use "bootstrap" instead of "rustbuild" (rust-lang/cargo#14207) - test: migrate serveral files to snapbox (rust-lang/cargo#14180) - Add rustdocflags to Unit's Debug impl (rust-lang/cargo#14201) - Allow enabling `config-include` feature in config (rust-lang/cargo#14196) - fix(test): Restore `does_not_contain` for check (rust-lang/cargo#14198) - test: migrate patch, pkgid, proc_macro and progress to snapbox (rust-lang/cargo#14181) - test: Migrate jobserver to snapbox (rust-lang/cargo#14191) - chore(deps): update msrv (3 versions) to v1.77 (rust-lang/cargo#14186) - test: migrate build_plan and build_script to snapbox (rust-lang/cargo#14193) - test: migrate cfg and check to snapbox (rust-lang/cargo#14185) - test: migrate install* and inheritable_workspace_fields to snapbox (rust-lang/cargo#14170) - Pass rustflags to artifacts built with implicit targets when using target-applies-to-host (rust-lang/cargo#13900) - test: Migrate network tests to snapbox (rust-lang/cargo#14187) - test: migrate some files to snapbox (rust-lang/cargo#14113) - test: Auto-redact `... after last build at ...`; Migrate `freshness` to Snapbox (rust-lang/cargo#14161) - chore: fix some typos (rust-lang/cargo#14182) - fix: improve message for inactive weak optional feature with edition2024 through unused dep collection (rust-lang/cargo#14026) - test：migrate `doc/directory/docscrape` to snapbox (rust-lang/cargo#14171) - test: Migrate git_auth to snapbox (rust-lang/cargo#14172)

rustbot assigned ehuss Jul 3, 2024

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 3, 2024

eth3lbert force-pushed the snapbox-c branch 5 times, most recently from eabce0d to 2557a32 Compare July 3, 2024 23:15

test: migrate cfg to snapbox

de159b0

eth3lbert force-pushed the snapbox-c branch from 2557a32 to 4314ae1 Compare July 3, 2024 23:52

weihanglo mentioned this pull request Jul 4, 2024

Port from bespoke assertions of snapbox #14039

Closed

eth3lbert force-pushed the snapbox-c branch 2 times, most recently from fb8f53b to 3596042 Compare July 4, 2024 04:28

eth3lbert commented Jul 4, 2024

View reviewed changes

weihanglo reviewed Jul 4, 2024

View reviewed changes

test: migrate check to snapbox

2706247

eth3lbert force-pushed the snapbox-c branch from 3596042 to 2706247 Compare July 4, 2024 22:52

weihanglo approved these changes Jul 5, 2024

View reviewed changes

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 Jul 5, 2024

bors merged commit 236f58a into rust-lang:master Jul 5, 2024

eth3lbert deleted the snapbox-c branch July 5, 2024 01:00

bors mentioned this pull request Jul 5, 2024

Check build target supports std when building with -Zbuild-std=std #14183

Merged

weihanglo mentioned this pull request Jul 5, 2024

Update cargo rust-lang/rust#127385

Merged

eth3lbert mentioned this pull request Jul 5, 2024

fix(test): Restore does_not_contain for check #14198

Merged

rustbot added this to the 1.81.0 milestone Jul 7, 2024

		___[EXE]
		lib___.rlib

Conversation

eth3lbert commented Jul 3, 2024

What does this PR try to resolve?

Uh oh!

rustbot commented Jul 3, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eth3lbert Jul 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eth3lbert commented Jul 4, 2024

Uh oh!

weihanglo commented Jul 5, 2024

Uh oh!

bors commented Jul 5, 2024

Uh oh!

bors commented Jul 5, 2024

Uh oh!

bors commented Jul 5, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

eth3lbert Jul 4, 2024 •

edited

Loading