test: migrate profile* to snapbox by eth3lbert · Pull Request #14128 · rust-lang/cargo

eth3lbert · 2024-06-23T04:20:36Z

What does this PR try to resolve?

Part of #14039.

Migrate following to snapbox:

tests/testsuite/profile_config.rs
tests/testsuite/profile_custom.rs
tests/testsuite/profile_overrides.rs
tests/testsuite/profile_targets.rs
tests/testsuite/profile_trim_paths.rs
tests/testsuite/profiles.rs

rustbot · 2024-06-23T04:20:40Z

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

eth3lbert · 2024-06-23T06:04:03Z

tests/testsuite/profile_config.rs

        .run();
 }

+#[allow(deprecated)]


with_stderr_does_not_contain is being used in this function.

eth3lbert · 2024-06-23T06:04:30Z

tests/testsuite/profile_config.rs

        .run();
 }

+#[allow(deprecated)]


with_stdout_does_not_contain is being used in this function.

eth3lbert · 2024-06-23T06:06:37Z

tests/testsuite/profile_trim_paths.rs

        .run();
 }

+#[allow(deprecated)]


with_stderr_does_not_contain is being used in this function.

eth3lbert · 2024-06-23T06:07:11Z

tests/testsuite/profile_trim_paths.rs

        .run();
 }

+#[allow(deprecated)]


with_stderr_line_without is being used in this function.

eth3lbert · 2024-06-23T06:08:11Z

tests/testsuite/profiles.rs

        .run();
 }

+#[allow(deprecated)]


with_stderr_does_not_contain is being used in this function.

eth3lbert · 2024-06-23T06:09:04Z

tests/testsuite/profiles.rs

        .run();
 }

+#[allow(deprecated)]


with_stderr_does_not_contain is being used in this function.

eth3lbert · 2024-06-23T06:10:07Z

tests/testsuite/profile_overrides.rs

        .run();
 }

+#[allow(deprecated)]


with_stderr_line_without is being used in this function.

weihanglo

Thank you for spending a lot of time on this migration!

tests/testsuite/profile_custom.rs

weihanglo · 2024-06-23T17:59:23Z

tests/testsuite/profile_targets.rs

-[RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=5 [..]
-[RUNNING] `[..]/target/debug/build/foo-[..]/build-script-build`
+[COMPILING] bar v0.0.1 ([ROOT]/foo/bar)
+[RUNNING] `[..] rustc --crate-name bar --edition=2015 bar/src/lib.rs [..]--crate-type lib --emit=[..]link -C embed-bitcode=[..]-C codegen-units=1 -C debuginfo=2 [..]`


Why do we need to check -C embed-bitcode here and other tests in this file? The old assertion doesn't seem to check that.

Oh, I forgot to mention this! I'm having a hard time with an old assertion here that seems to be flaky.

My best guess is that an assertion without panic-abort is a superset of the one with panic-abort. This could lead to a mismatch when the running command with panic-abort executes first and consumes the assertion without panic-abort. As a result, the command without panic-abort wouldn't be able to find a valid assertion afterwards.

It still seems a bit odd to me using -C embed-bitcode as a workaround, though it doesn't really too bad so fine with it.

weihanglo · 2024-06-23T20:26:40Z

tests/testsuite/profile_targets.rs

-[RUNNING] `[..] rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin --emit=[..]link[..]-C codegen-units=5 [..]
-[RUNNING] `[..]/target/debug/build/foo-[..]/build-script-build`
+[COMPILING] bar v0.0.1 ([ROOT]/foo/bar)
+[RUNNING] `[..] rustc --crate-name bar --edition=2015 bar/src/lib.rs [..]--crate-type lib --emit=[..]link -C embed-bitcode=[..]-C codegen-units=1 -C debuginfo=2 [..]`


It still seems a bit odd to me using -C embed-bitcode as a workaround, though it doesn't really too bad so fine with it.

weihanglo · 2024-06-23T20:27:01Z

Great work!

@bors r+

bors · 2024-06-23T20:27:03Z

📌 Commit 1559840 has been approved by weihanglo

It is now in the queue for this repository.

bors · 2024-06-23T20:53:09Z

⌛ Testing commit 1559840 with merge e18afe2...

bors · 2024-06-23T21:31:43Z

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

Update cargo 10 commits in bc89bffa5987d4af8f71011c7557119b39e44a65..4ed7bee47f7dd4416b36fada1909e9a62c546246 2024-06-22 00:36:36 +0000 to 2024-06-25 16:28:22 +0000 - test: omit target-dir name (rust-lang/cargo#14142) - test: migrate offline, open_namespaces and owner to snapbox (rust-lang/cargo#14138) - docs: remove stray comment (rust-lang/cargo#14133) - Change tests to support `rustc` wording changes (rust-lang/cargo#14135) - deps: dont use tracing-attributes for workspace, use for cargo only (rust-lang/cargo#14122) - Include vcs_info even if workspace is dirty (rust-lang/cargo#13960) - test: migrate profile* to snapbox (rust-lang/cargo#14128) - test: migrate path and paths to snapbox (rust-lang/cargo#14109) - test: migrate rustflags, rustup and script to snapbox (rust-lang/cargo#14126) - test: migrate rename_deps, replace, required_features and run to snapbox (rust-lang/cargo#14127)

rustbot assigned epage Jun 23, 2024

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

eth3lbert force-pushed the snapbox-profile branch from e7c9671 to cc0d0b3 Compare June 23, 2024 04:38

test: migrate profile_config to snapbox

f58bb77

eth3lbert force-pushed the snapbox-profile branch 3 times, most recently from 9a950d8 to 9c8dfd0 Compare June 23, 2024 05:35

eth3lbert commented Jun 23, 2024

View reviewed changes

weihanglo mentioned this pull request Jun 23, 2024

Port from bespoke assertions of snapbox #14039

Closed

weihanglo reviewed Jun 23, 2024

View reviewed changes

eth3lbert added 5 commits June 24, 2024 03:59

test: migrate profile_custom to snapbox

dbb67df

test: migrate profile_overrides to snapbox

41930ab

test: migrate profile_targets to snapbox

02542ef

test: migrate profile_trim_paths to snapbox

1ba4291

test: migrate profiles to snapbox

1559840

eth3lbert force-pushed the snapbox-profile branch from 9c8dfd0 to 1559840 Compare June 23, 2024 19:59

weihanglo approved these changes Jun 23, 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 Jun 23, 2024

bors merged commit e18afe2 into rust-lang:master Jun 23, 2024

bors mentioned this pull request Jun 23, 2024

feat(profile): panic behavior can be specified for custom harness #11272

Closed

eth3lbert deleted the snapbox-profile branch June 23, 2024 21:46

weihanglo mentioned this pull request Jun 25, 2024

Update cargo rust-lang/rust#126955

Merged

rustbot added this to the 1.81.0 milestone Jun 26, 2024

Conversation

eth3lbert commented Jun 23, 2024

What does this PR try to resolve?

Uh oh!

rustbot commented Jun 23, 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!

weihanglo left a comment

Choose a reason for hiding this comment

Uh oh!

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!

weihanglo commented Jun 23, 2024

Uh oh!

bors commented Jun 23, 2024

Uh oh!

bors commented Jun 23, 2024

Uh oh!

bors commented Jun 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants