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.

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: relax help text assertion #12416

Merged
merged 1 commit into from Jul 30, 2023
Merged

test: relax help text assertion #12416

merged 1 commit into from Jul 30, 2023

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

When running test in rust-lang/rust via ./x test src/tool/cargo, there is no rustup integrated.

How should we test and review this PR?

Update the submodule and run ./x test src/tool/cargo in rust-lang/rust repo.

When running test in rust-lang/rust via `./x test src/tool/cargo`,
there is no rustup integrated.
@rustbot
Copy link
Collaborator

rustbot commented Jul 30, 2023

r? @ehuss

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 30, 2023
@ehuss
Copy link
Contributor

ehuss commented Jul 30, 2023

Thanks!

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 30, 2023

📌 Commit b595279 has been approved by ehuss

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 30, 2023
@bors
Copy link
Collaborator

bors commented Jul 30, 2023

⌛ Testing commit b595279 with merge fbf29f0...

@bors
Copy link
Collaborator

bors commented Jul 30, 2023

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing fbf29f0 to master...

@bors bors merged commit fbf29f0 into rust-lang:master Jul 30, 2023
19 checks passed
@weihanglo weihanglo deleted the helptext branch July 30, 2023 14:39
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 31, 2023
Update cargo

14 commits in 7ac9416d82cd4fc5e707c9ec3574d22dff6466e5..c91a693e7977e33a1064b63a5daf5fb689f01651
2023-07-24 14:29:38 +0000 to 2023-07-31 00:26:46 +0000
- fix: align `cargo --help` text (rust-lang/cargo#12418)
- fix: normalize relative git submodule urls with `ssh://` (rust-lang/cargo#12411)
- test: relax help text assertion (rust-lang/cargo#12416)
- test: relax assertions of panic handler message format (rust-lang/cargo#12413)
- fix(package): Recognize and normalize `cargo.toml` (rust-lang/cargo#12399)
- Clarify `lto` setting passing `-Clinker-plugin-lto` (rust-lang/cargo#12407)
- doc: add missing reference to `CARGO_PROFILE_<name>_STRIP` in environment variables docs (rust-lang/cargo#12408)
- Update curl-sys to pull in curl 8.2.1 (rust-lang/cargo#12406)
- docs: raise awareness of resolver used inside workspace (rust-lang/cargo#12388)
- chore: update `home` to 0.5.7 (rust-lang/cargo#12401)
- Update curl-sys to pull in curl 8.2.0 (rust-lang/cargo#12400)
- test(cli): Track --help output (rust-lang/cargo#11912)
- refactor(test): Move cargo-config into a dir (rust-lang/cargo#12398)
- refactor(tests): Name init ui tests more consistently (rust-lang/cargo#12397)

r? `@ghost`
@ehuss ehuss added this to the 1.73.0 milestone Aug 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants