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

test: migrate features_are_quoted to snapbox #14051

Merged
merged 2 commits into from
Jun 13, 2024
Merged

test: migrate features_are_quoted to snapbox #14051

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd59059
test: migrate features_are_quoted to snapbox
henry40408 Jun 12, 2024
3a19de7
refactor: apply suggestions from code review
henry40408 Jun 13, 2024
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
31 changes: 20 additions & 11 deletions tests/testsuite/shell_quoting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
//! in the output, their arguments are quoted properly
//! so that the command can be run in a terminal.

#![allow(deprecated)]

use cargo_test_support::project;
use cargo_test_support::str;

#[cargo_test]
fn features_are_quoted() {
Expand All @@ -26,14 +25,24 @@ fn features_are_quoted() {
.build();

p.cargo("check -v")
.env("MSYSTEM", "1")
.with_status(101)
.with_stderr_contains(
r#"[RUNNING] `rustc [..] --cfg 'feature="default"' --cfg 'feature="some_feature"' [..]`"#
).with_stderr_contains(
r#"
.env("MSYSTEM", "1")
.with_status(101)
.with_stderr_data(str![])
henry40408 marked this conversation as resolved.
Show resolved Hide resolved
.with_stderr_data(str![[r#"
[CHECKING] foo v0.1.0 ([ROOT]/foo)
[RUNNING] `rustc --crate-name foo --edition=2015 src/main.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,metadata -C embed-bitcode=no -C debuginfo=2 --cfg 'feature="default"' --cfg 'feature="some_feature"' -C metadata=c2925e00c1458fcb -C extra-filename=-c2925e00c1458fcb --out-dir [ROOT]/foo/target/debug/deps -L dependency=[ROOT]/foo/target/debug/deps`
henry40408 marked this conversation as resolved.
Show resolved Hide resolved
error[E0425]: cannot find value `error` in this scope
--> src/main.rs:1:12
|
1 | fn main() {error}
| ^^^^^ not found in this scope

For more information about this error, try `rustc --explain E0425`.
Copy link
Member

Choose a reason for hiding this comment

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

Snapshotting rustc output is a bit risky. If applicable we should omit it by ....

Suggested change
error[E0425]: cannot find value `error` in this scope
--> src/main.rs:1:12
|
1 | fn main() {error}
| ^^^^^ not found in this scope
For more information about this error, try `rustc --explain E0425`.
...

Copy link
Member

Choose a reason for hiding this comment

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

By risky I mean rustc output is not guaranteed stable and might break cargo test suites between different toolchain versions.

Copy link
Contributor

Choose a reason for hiding this comment

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

I've added this to the porting steps

  • If replacing a contains with an equality check, use multi-line globs (...) for rustc errors that weren't previously matched to minimize tying Cargo's tests to the exact output of rustc

[ERROR] could not compile `foo` (bin "foo") due to 1 previous error

Caused by:
process didn't exit successfully: [..] --cfg 'feature="default"' --cfg 'feature="some_feature"' [..]"#
)
.run();
process didn't exit successfully: `rustc --crate-name foo --edition=2015 src/main.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,metadata -C embed-bitcode=no -C debuginfo=2 --cfg 'feature="default"' --cfg 'feature="some_feature"' -C metadata=c2925e00c1458fcb -C extra-filename=-c2925e00c1458fcb --out-dir [ROOT]/foo/target/debug/deps -L dependency=[ROOT]/foo/target/debug/deps` (exit status: 1)
henry40408 marked this conversation as resolved.
Show resolved Hide resolved

"#]])
.run();
}
Loading