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

test: Fix some test based on rustc version #14282

Merged
merged 2 commits into from
Jul 22, 2024
Merged

test: Fix some test based on rustc version #14282

merged 2 commits into from
Jul 22, 2024

Conversation

linyihai
Copy link
Contributor

What does this PR try to resolve?

Some test ouput specifies the latest rustc version and will failed when the rustc version get updated

How should we test and review this PR?

Additional information

@rustbot
Copy link
Collaborator

rustbot commented Jul 22, 2024

r? @weihanglo

rustbot has assigned @weihanglo.
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 the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 22, 2024
linyihai
linyihai commented Jul 22, 2024
View reviewed changes
tests/testsuite/build.rs
@@ -6419,7 +6419,6 @@ fn pipelining_big_graph() {
.with_stderr_data(
str![[r#"
[LOCKING] 61 packages to latest compatible versions
[COMPILING] b30 v0.5.0 ([ROOT]/foo/b30)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I havn't known why this need to be removed in MacOS, see https://github.com/rust-lang/cargo/actions/runs/10036500039/job/27734366493

thread 'build::pipelining_big_graph' panicked at tests/testsuite/build.rs:6432:10:

---- expected: tests/testsuite/build.rs:6420:13
++++ actual:   stderr
   1    1 | [LOCKING] 61 packages to latest compatible versions
   2      - [COMPILING] b30 v0.5.0 ([ROOT]/foo/b30)
   3    2 | [COMPILING] a30 v0.5.0 ([ROOT]/foo/a30)
   4    3 | [ERROR] don't actually build me
   5    4 | ...
   6    5 | [ERROR] could not compile `a30` (lib) due to 1 previous error
   7    6 | ...

@epage
Copy link
Contributor

epage commented Jul 22, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 22, 2024

📌 Commit 68e91be 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 Jul 22, 2024
@bors
Copy link
Collaborator

bors commented Jul 22, 2024

⌛ Testing commit 68e91be with merge 693d49c...

@bors
Copy link
Collaborator

bors commented Jul 22, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing 693d49c to master...

@bors bors merged commit 693d49c into rust-lang:master Jul 22, 2024
21 of 22 checks passed
@linyihai linyihai deleted the fix-test branch July 23, 2024 06:42
@weihanglo weihanglo mentioned this pull request Jul 27, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2024
@bors
Auto merge of rust-lang#128270 - weihanglo:update-cargo, r=weihanglo
c4f5a7b 
Update cargo

14 commits in 5f6b9a92201d78af75dc24f14662c3e2dacbbbe1..b5d44db1daf0469b227a6211b987162a39a54730
2024-07-19 18:09:17 +0000 to 2024-07-26 21:27:12 +0000
- Package workspaces (rust-lang/cargo#13947)
- test: migrate messages to snapbox (rust-lang/cargo#14242)
- chore: Update dependencies (rust-lang/cargo#14299)
- fix: remove rustc probe for `--check-cfg` support (rust-lang/cargo#14302)
- Misc test clean up (rust-lang/cargo#14297)
- Don't downgrade on prerelease `VersionReq` when update with --breaking. (rust-lang/cargo#14250)
- test: Migrate some json tests to snapbox (rust-lang/cargo#14293)
- Revert "fix: Ensure dep/feature activates the dependency on 2024" (rust-lang/cargo#14295)
- chore: bump cargo-test-support to 0.4.0 (rust-lang/cargo#14286)
- Bump to 0.83.0; update changelog (rust-lang/cargo#14285)
- Improved error message when `update --breaking` invalid spec. (rust-lang/cargo#14279)
- docs(test): Expand documentation of cargo-test-support (rust-lang/cargo#14272)
- test: Fix some test based on rustc version (rust-lang/cargo#14282)
- Use `Rc` instead of `Arc` for storing rustflags (rust-lang/cargo#14273)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2024
@bors
Auto merge of rust-lang#128270 - weihanglo:update-cargo, r=weihanglo
a279fa1 
Update cargo

14 commits in 5f6b9a92201d78af75dc24f14662c3e2dacbbbe1..b5d44db1daf0469b227a6211b987162a39a54730
2024-07-19 18:09:17 +0000 to 2024-07-26 21:27:12 +0000
- Package workspaces (rust-lang/cargo#13947)
- test: migrate messages to snapbox (rust-lang/cargo#14242)
- chore: Update dependencies (rust-lang/cargo#14299)
- fix: remove rustc probe for `--check-cfg` support (rust-lang/cargo#14302)
- Misc test clean up (rust-lang/cargo#14297)
- Don't downgrade on prerelease `VersionReq` when update with --breaking. (rust-lang/cargo#14250)
- test: Migrate some json tests to snapbox (rust-lang/cargo#14293)
- Revert "fix: Ensure dep/feature activates the dependency on 2024" (rust-lang/cargo#14295)
- chore: bump cargo-test-support to 0.4.0 (rust-lang/cargo#14286)
- Bump to 0.83.0; update changelog (rust-lang/cargo#14285)
- Improved error message when `update --breaking` invalid spec. (rust-lang/cargo#14279)
- docs(test): Expand documentation of cargo-test-support (rust-lang/cargo#14272)
- test: Fix some test based on rustc version (rust-lang/cargo#14282)
- Use `Rc` instead of `Arc` for storing rustflags (rust-lang/cargo#14273)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2024
@bors
Auto merge of rust-lang#128270 - weihanglo:update-cargo, r=weihanglo
385a74f 
Update cargo

14 commits in 5f6b9a92201d78af75dc24f14662c3e2dacbbbe1..b5d44db1daf0469b227a6211b987162a39a54730
2024-07-19 18:09:17 +0000 to 2024-07-26 21:27:12 +0000
- Package workspaces (rust-lang/cargo#13947)
- test: migrate messages to snapbox (rust-lang/cargo#14242)
- chore: Update dependencies (rust-lang/cargo#14299)
- fix: remove rustc probe for `--check-cfg` support (rust-lang/cargo#14302)
- Misc test clean up (rust-lang/cargo#14297)
- Don't downgrade on prerelease `VersionReq` when update with --breaking. (rust-lang/cargo#14250)
- test: Migrate some json tests to snapbox (rust-lang/cargo#14293)
- Revert "fix: Ensure dep/feature activates the dependency on 2024" (rust-lang/cargo#14295)
- chore: bump cargo-test-support to 0.4.0 (rust-lang/cargo#14286)
- Bump to 0.83.0; update changelog (rust-lang/cargo#14285)
- Improved error message when `update --breaking` invalid spec. (rust-lang/cargo#14279)
- docs(test): Expand documentation of cargo-test-support (rust-lang/cargo#14272)
- test: Fix some test based on rustc version (rust-lang/cargo#14282)
- Use `Rc` instead of `Arc` for storing rustflags (rust-lang/cargo#14273)

r? ghost
@rustbot rustbot added this to the 1.82.0 milestone Jul 28, 2024
@epage epage mentioned this pull request Jul 31, 2024
Merged
bors added a commit that referenced this pull request Jul 31, 2024
@bors
Auto merge of #14328 - epage:14321-cherry-pick, r=weihanglo
ca2346b 
[beta-1.81] fix(publish): Don't strip non-dev features

Beta backports

* #14325

In order to make CI pass, the following PRs are also cherry-picked:

* #14282 363ddd4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@weihanglo weihanglo

Labels
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.82.0
Development

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